Skip to content

Commit 9f4bcf8

Browse files
avargitster
authored andcommitted
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 ca8d148 ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8d7b558 commit 9f4bcf8

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

t/t2024-checkout-dwim.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ test_branch_upstream () {
2424
}
2525

2626
status_uno_is_clean () {
27-
>status.expect &&
2827
git status -uno --porcelain >status.actual &&
29-
test_cmp status.expect status.actual
28+
test_must_be_empty status.actual
3029
}
3130

3231
test_expect_success 'setup' '

t/t2025-worktree-add.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,8 @@ test_expect_success '"add" <path> <branch> dwims with checkout.defaultRemote' '
412412
git fetch repo_upstream2 &&
413413
test_must_fail git worktree add ../foo foo &&
414414
git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo &&
415-
>status.expect &&
416415
git status -uno --porcelain >status.actual &&
417-
test_cmp status.expect status.actual
416+
test_must_be_empty status.actual
418417
) &&
419418
(
420419
cd foo &&

0 commit comments

Comments
 (0)