mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'jt/tests-with-reftable'
Tweak a few tests not to manually modify the reference database (hence easier to work with other backends like reftable). * jt/tests-with-reftable: t5541: remove lockfile creation t1401: remove lockfile creation
This commit is contained in:
commit
bb98703f60
|
@ -106,9 +106,8 @@ test_expect_success LONG_REF 'we can parse long symbolic ref' '
|
|||
'
|
||||
|
||||
test_expect_success 'symbolic-ref reports failure in exit code' '
|
||||
test_when_finished "rm -f .git/HEAD.lock" &&
|
||||
>.git/HEAD.lock &&
|
||||
test_must_fail git symbolic-ref HEAD refs/heads/whatever
|
||||
# Create d/f conflict to simulate failure.
|
||||
test_must_fail git symbolic-ref refs/heads refs/heads/foo
|
||||
'
|
||||
|
||||
test_expect_success 'symbolic-ref writes reflog entry' '
|
||||
|
|
|
@ -232,8 +232,9 @@ test_expect_success 'push --atomic fails on server-side errors' '
|
|||
test_config -C "$d" http.receivepack true &&
|
||||
up="$HTTPD_URL"/smart/atomic-branches.git &&
|
||||
|
||||
# break ref updates for other on the remote site
|
||||
mkdir "$d/refs/heads/other.lock" &&
|
||||
# Create d/f conflict to break ref updates for other on the remote site.
|
||||
git -C "$d" update-ref -d refs/heads/other &&
|
||||
git -C "$d" update-ref refs/heads/other/conflict HEAD &&
|
||||
|
||||
# add the new commit to other
|
||||
git branch -f other collateral &&
|
||||
|
@ -241,18 +242,9 @@ test_expect_success 'push --atomic fails on server-side errors' '
|
|||
# --atomic should cause entire push to be rejected
|
||||
test_must_fail git push --atomic "$up" atomic other 2>output &&
|
||||
|
||||
# the new branch should not have been created upstream
|
||||
test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
|
||||
|
||||
# upstream should still reflect atomic2, the last thing we pushed
|
||||
# successfully
|
||||
git rev-parse atomic2 >expected &&
|
||||
# ...to other.
|
||||
git -C "$d" rev-parse refs/heads/other >actual &&
|
||||
test_cmp expected actual &&
|
||||
|
||||
# the new branch should not have been created upstream
|
||||
# The atomic and other branches should not be created upstream.
|
||||
test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
|
||||
test_must_fail git -C "$d" show-ref --verify refs/heads/other &&
|
||||
|
||||
# the failed refs should be indicated to the user
|
||||
grep "^ ! .*rejected.* other -> other .*atomic transaction failed" output &&
|
||||
|
|
Loading…
Reference in a new issue