diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:54 -0700 |
| commit | 28bdd99065afa449b59d864be776ecf587c5bc18 (patch) | |
| tree | d2da2210809caaf04a1906f32aae207fdbd55b48 /t | |
| parent | Merge branch 'es/rebase-i-author-script-fix' (diff) | |
| parent | tests: make use of the test_must_be_empty function (diff) | |
| download | tgif-28bdd99065afa449b59d864be776ecf587c5bc18.tar.xz | |
Merge branch 'ab/test-must-be-empty'
Test updates.
* ab/test-must-be-empty:
tests: make use of the test_must_be_empty function
Diffstat (limited to 't')
| -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 && |