summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ivy III <rivy.dev@gmail.com>2020-07-21 20:55:26 -0500
committerSebastian Thiel <sebastian.thiel@icloud.com>2020-07-22 10:09:11 +0800
commit62c58330b41cb19adde1c7d2b08a5db251be3580 (patch)
tree2168deb30c1581d393d54e63a08623ec19ce064e
parent48cbe0919da1dd6aa8c933b5d156e7f0ce5997a8 (diff)
Fix platform size difference of 'sample_01_tree' for test
- symbolic links are '0' size on windows vs '1' on *nix-type platforms
-rw-r--r--src/interactive/app_test/unit.rs2
-rw-r--r--src/interactive/app_test/utils.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/interactive/app_test/unit.rs b/src/interactive/app_test/unit.rs
index 320267d..8910025 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 a42f36b..90748b2 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));