Merge branch 'ab/test-must-be-empty'

Test updates.

* ab/test-must-be-empty:
  tests: make use of the test_must_be_empty function
This commit is contained in:
Junio C Hamano 2018-08-17 13:09:54 -07:00
commit 28bdd99065
2 changed files with 2 additions and 4 deletions

View File

@ -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' '

View File

@ -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 &&