From ea504bf0eceb3ae867449dbbb4d51b3f698d3968 Mon Sep 17 00:00:00 2001 From: bootandy Date: Tue, 20 Mar 2018 17:55:31 -0400 Subject: [PATCH] du: add test for -d flag --- .../{subwords2.txt => deeper/words.txt} | 0 .../du/subdir/{ => links}/subwords.txt | Bin tests/fixtures/du/subdir/links/subwords2.txt | 1 + tests/fixtures/du/words.txt | 2 +- tests/test_du.rs | 46 +++++++++--------- 5 files changed, 26 insertions(+), 23 deletions(-) rename tests/fixtures/du/subdir/{subwords2.txt => deeper/words.txt} (100%) rename tests/fixtures/du/subdir/{ => links}/subwords.txt (100%) create mode 100644 tests/fixtures/du/subdir/links/subwords2.txt diff --git a/tests/fixtures/du/subdir/subwords2.txt b/tests/fixtures/du/subdir/deeper/words.txt similarity index 100% rename from tests/fixtures/du/subdir/subwords2.txt rename to tests/fixtures/du/subdir/deeper/words.txt diff --git a/tests/fixtures/du/subdir/subwords.txt b/tests/fixtures/du/subdir/links/subwords.txt similarity index 100% rename from tests/fixtures/du/subdir/subwords.txt rename to tests/fixtures/du/subdir/links/subwords.txt diff --git a/tests/fixtures/du/subdir/links/subwords2.txt b/tests/fixtures/du/subdir/links/subwords2.txt new file mode 100644 index 000000000..ce0136250 --- /dev/null +++ b/tests/fixtures/du/subdir/links/subwords2.txt @@ -0,0 +1 @@ +hello diff --git a/tests/fixtures/du/words.txt b/tests/fixtures/du/words.txt index ce0136250..45b983be3 100644 --- a/tests/fixtures/du/words.txt +++ b/tests/fixtures/du/words.txt @@ -1 +1 @@ -hello +hi diff --git a/tests/test_du.rs b/tests/test_du.rs index d71ad1453..484bf937c 100644 --- a/tests/test_du.rs +++ b/tests/test_du.rs @@ -1,18 +1,22 @@ use common::util::*; -use std::fs::set_permissions; -static SUB_DIR: &str = "subdir"; -static SUB_FILE: &str = "subdir/subwords.txt"; -static SUB_LINK: &str = "subdir/sublink.txt"; +static SUB_DIR: &str = "subdir/deeper"; +static SUB_DIR_LINKS: &str = "subdir/links"; +static SUB_FILE: &str = "subdir/links/subwords.txt"; +static SUB_LINK: &str = "subdir/links/sublink.txt"; #[test] fn test_du_basics() { let (_at, mut ucmd) = at_and_ucmd!(); - + let answer = "32\t./subdir +8\t./subdir/deeper +24\t./subdir/links +40\t./ +"; let result = ucmd.run(); assert!(result.success); assert_eq!(result.stderr, ""); - assert_eq!(result.stdout, "24\t./subdir\n32\t./\n"); + assert_eq!(result.stdout, answer); } #[test] @@ -22,7 +26,7 @@ fn test_du_basics_subdir() { let result = ucmd.arg(SUB_DIR).run(); assert!(result.success); assert_eq!(result.stderr, ""); - assert_eq!(result.stdout, "24\tsubdir\n"); + assert_eq!(result.stdout, "8\tsubdir/deeper\n"); } #[test] @@ -41,10 +45,10 @@ fn test_du_soft_link() { let link = ts.cmd("ln").arg("-s").arg(SUB_FILE).arg(SUB_LINK).run(); assert!(link.success); - let result = ts.ucmd().arg(SUB_DIR).run(); + let result = ts.ucmd().arg(SUB_DIR_LINKS).run(); assert!(result.success); assert_eq!(result.stderr, ""); - assert_eq!(result.stdout, "32\tsubdir\n"); + assert_eq!(result.stdout, "32\tsubdir/links\n"); } #[test] @@ -54,21 +58,19 @@ fn test_du_hard_link() { let link = ts.cmd("ln").arg(SUB_FILE).arg(SUB_LINK).run(); assert!(link.success); - let result = ts.ucmd().arg(SUB_DIR).run(); + let result = ts.ucmd().arg(SUB_DIR_LINKS).run(); assert!(result.success); assert_eq!(result.stderr, ""); // We do not double count hard links as the inodes are identicle - assert_eq!(result.stdout, "24\tsubdir\n"); + assert_eq!(result.stdout, "24\tsubdir/links\n"); } -// todo: -// du on file with no permissions -// du on multi dir with '-d' -// -/* - * let mut permissions = at.make_file(TEST_HELLO_WORLD_DEST) - * .metadata() - * .unwrap() - * .permissions(); - * permissions.set_readonly(true); - */ +#[test] +fn test_du_d_flag() { + let ts = TestScenario::new("du"); + + let result = ts.ucmd().arg("-d").arg("1").run(); + assert!(result.success); + assert_eq!(result.stderr, ""); + assert_eq!(result.stdout, "32\t./subdir\n40\t./\n"); +}