Skip to content

Commit

Permalink
t/t3905: use the name 'actual' for test output, swap arguments to tes…
Browse files Browse the repository at this point in the history
…t_cmp

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brandon Casey authored and Junio C Hamano committed Aug 27, 2011
1 parent 7875130 commit 4fd7312
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions t/t3905-stash-include-untracked.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 4fd7312

Please sign in to comment.