diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-07-27 17:48:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-30 11:19:34 -0700 |
| commit | 9f4bcf81eafa72587b2e3ec19690f127bc3ad7c8 (patch) | |
| tree | 4a00f67b19fd746610b15db00ce394f4357b6fde | |
| parent | checkout & worktree: introduce checkout.defaultRemote (diff) | |
| download | git-9f4bcf81eafa72587b2e3ec19690f127bc3ad7c8.tar.gz git-9f4bcf81eafa72587b2e3ec19690f127bc3ad7c8.zip | |
tests: make use of the test_must_be_empty function
Change various tests that use an idiom of the form:
>expect &&
test_cmp expect actual
To instead use:
test_must_be_empty actual
The test_must_be_empty() wrapper was introduced in ca8d148daf ("test:
test_must_be_empty helper", 2013-06-09). Many of these tests have been
added after that time. This was mostly found with, and manually pruned
from:
git grep '^\s+>.*expect.* &&$' t
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t2024-checkout-dwim.sh | 3 | ||||
| -rwxr-xr-x | t/t2025-worktree-add.sh | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh index 26dc3f1fc0..f79dfbbdd6 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -24,9 +24,8 @@ test_branch_upstream () { } status_uno_is_clean () { - >status.expect && git status -uno --porcelain >status.actual && - test_cmp status.expect status.actual + test_must_be_empty status.actual } test_expect_success 'setup' ' diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index be6e093142..166942c1bd 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -412,9 +412,8 @@ test_expect_success '"add" <path> <branch> dwims with checkout.defaultRemote' ' git fetch repo_upstream2 && test_must_fail git worktree add ../foo foo && git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo && - >status.expect && git status -uno --porcelain >status.actual && - test_cmp status.expect status.actual + test_must_be_empty status.actual ) && ( cd foo && |