From 62c58330b41cb19adde1c7d2b08a5db251be3580 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Tue, 21 Jul 2020 20:55:26 -0500 Subject: [PATCH] Fix platform size difference of 'sample_01_tree' for test - symbolic links are '0' size on windows vs '1' on *nix-type platforms --- src/interactive/app_test/unit.rs | 2 -- src/interactive/app_test/utils.rs | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/interactive/app_test/unit.rs b/src/interactive/app_test/unit.rs index 320267d1..89100252 100644 --- a/src/interactive/app_test/unit.rs +++ b/src/interactive/app_test/unit.rs @@ -4,8 +4,6 @@ use crate::interactive::app_test::utils::{ use anyhow::Result; use pretty_assertions::assert_eq; -// Won't work on windows as there are backslashes in the paths :D -#[cfg_attr(windows, ignore)] #[test] fn it_can_handle_ending_traversal_reaching_top_but_skipping_levels() -> Result<()> { let (_, app) = initialized_app_and_terminal_from_fixture(&["sample-01"])?; diff --git a/src/interactive/app_test/utils.rs b/src/interactive/app_test/utils.rs index a42f36b2..90748b26 100644 --- a/src/interactive/app_test/utils.rs +++ b/src/interactive/app_test/utils.rs @@ -211,7 +211,10 @@ pub fn sample_01_tree() -> Tree { let mut t = Tree::new(); { let mut add_node = make_add_node(&mut t); + #[cfg(not(windows))] let root_size = 1259070; + #[cfg(windows)] + let root_size = 1259069; let r = add_node("", root_size, None); { let s = add_node(&fixture_str("sample-01"), root_size, Some(r)); @@ -219,7 +222,10 @@ pub fn sample_01_tree() -> Tree { add_node(".hidden.666", 666, Some(s)); add_node("a", 256, Some(s)); add_node("b.empty", 0, Some(s)); + #[cfg(not(windows))] add_node("c.lnk", 1, Some(s)); + #[cfg(windows)] + add_node("c.lnk", 0, Some(s)); let d = add_node("dir", 1258024, Some(s)); { add_node("1000bytes", 1000, Some(d));