git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
@ 2011-08-27  0:59 Brandon Casey
  2011-08-27  0:59 ` [PATCH 2/4] git-stash.sh: fix typo in error message Brandon Casey
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Brandon Casey @ 2011-08-27  0:59 UTC (permalink / raw)
  To: gitster; +Cc: git, hilco.wijbenga, david, Brandon Casey

It is common practice in the git test suite to use the file names 'actual'
and 'expect' to hold the actual and expected output of commands.  So change
the name 'output' to 'actual'.

Additionally, swap the order of arguments to test_cmp when comparing
expected output and actual output so that if diff output is produced, it
describes how the actual output differs from what was expected rather than
the other way around.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
 t/t3905-stash-include-untracked.sh |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index 4f2eedf..adc2524 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -23,13 +23,13 @@ test_expect_success 'stash save --include-untracked some dirty working directory
 '
 
 cat > expect <<EOF
+?? actual
 ?? expect
-?? output
 EOF
 
 test_expect_success 'stash save --include-untracked cleaned the untracked files' '
-	git status --porcelain > output
-	test_cmp output expect
+	git status --porcelain >actual
+	test_cmp expect actual
 '
 
 cat > expect.diff <<EOF
@@ -47,10 +47,10 @@ EOF
 
 test_expect_success 'stash save --include-untracked stashed the untracked files' '
 	test "!" -f file2 &&
-	git diff HEAD..stash^3 -- file2 > output &&
-	test_cmp output expect.diff &&
-	git ls-tree --name-only stash^3: > output &&
-	test_cmp output expect.lstree
+	git diff HEAD..stash^3 -- file2 >actual &&
+	test_cmp expect.diff actual &&
+	git ls-tree --name-only stash^3: >actual &&
+	test_cmp expect.lstree actual
 '
 test_expect_success 'stash save --patch --include-untracked fails' '
 	test_must_fail git stash --patch --include-untracked
@@ -64,15 +64,15 @@ git clean --force --quiet
 
 cat > expect <<EOF
  M file
+?? actual
 ?? expect
 ?? file2
-?? output
 EOF
 
 test_expect_success 'stash pop after save --include-untracked leaves files untracked again' '
 	git stash pop &&
-	git status --porcelain > output
-	test_cmp output expect
+	git status --porcelain >actual
+	test_cmp expect actual
 '
 
 git clean --force --quiet
@@ -96,8 +96,8 @@ EOF
 
 test_expect_success 'stash save --include-untracked dirty index got stashed' '
 	git stash pop --index &&
-	git diff --cached > output &&
-	test_cmp output expect
+	git diff --cached >actual &&
+	test_cmp expect actual
 '
 
 git reset > /dev/null
-- 
1.7.6

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-27 18:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-27  0:59 [PATCH 1/4] t/t3905: use the name 'actual' for test output, swap arguments to test_cmp Brandon Casey
2011-08-27  0:59 ` [PATCH 2/4] git-stash.sh: fix typo in error message Brandon Casey
2011-08-27  0:59 ` [PATCH 3/4] t/t3905: add missing '&&' linkage Brandon Casey
2011-08-27  0:59 ` [PATCH 4/4] git-stash: remove untracked/ignored directories when stashed Brandon Casey
2011-08-27  1:04   ` Hilco Wijbenga
2011-08-27 18:50 ` [PATCH 1/4] t/t3905: use the name 'actual' for test output, swap arguments to test_cmp Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).