test: refactor test-push-* and move tests to test-push-failures-local
`test-push-missing.sh` tested two error conditions (missing and corrupt) with one `git push` exit code check. Split the test into two tests to ensure both errors cause a `git push` error exit. `test-push.sh` contained tests similar to `test-push-missing.sh`. Group them all together in the new test file.
This commit is contained in:
parent
0d3b10e57b
commit
4d52e080b3
200
test/test-push-failures-local.sh
Executable file
200
test/test-push-failures-local.sh
Executable file
@ -0,0 +1,200 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
. "test/testlib.sh"
|
||||||
|
|
||||||
|
begin_test "push with missing objects (lfs.allowincompletepush=t)"
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
|
||||||
|
reponame="push-with-missing-objects"
|
||||||
|
setup_remote_repo "$reponame"
|
||||||
|
clone_repo "$reponame" "$reponame"
|
||||||
|
|
||||||
|
git lfs track "*.dat"
|
||||||
|
git add .gitattributes
|
||||||
|
git commit -m "initial commit"
|
||||||
|
|
||||||
|
present="present"
|
||||||
|
present_oid="$(calc_oid "$present")"
|
||||||
|
printf "$present" > present.dat
|
||||||
|
|
||||||
|
missing="missing"
|
||||||
|
missing_oid="$(calc_oid "$missing")"
|
||||||
|
printf "$missing" > missing.dat
|
||||||
|
|
||||||
|
git add missing.dat present.dat
|
||||||
|
git commit -m "add objects"
|
||||||
|
|
||||||
|
git rm missing.dat
|
||||||
|
git commit -m "remove missing"
|
||||||
|
|
||||||
|
# :fire: the "missing" object
|
||||||
|
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
||||||
|
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
||||||
|
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||||
|
rm "$missing_oid_path"
|
||||||
|
|
||||||
|
git push origin master 2>&1 | tee push.log
|
||||||
|
if [ "0" -ne "${PIPESTATUS[0]}" ]; then
|
||||||
|
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
grep "LFS upload missing objects" push.log
|
||||||
|
grep " (missing) missing.dat ($missing_oid)" push.log
|
||||||
|
|
||||||
|
assert_server_object "$reponame" "$present_oid"
|
||||||
|
refute_server_object "$reponame" "$missing_oid"
|
||||||
|
)
|
||||||
|
end_test
|
||||||
|
|
||||||
|
begin_test "push reject missing objects (lfs.allowincompletepush=f)"
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
|
||||||
|
reponame="push-reject-missing-objects"
|
||||||
|
setup_remote_repo "$reponame"
|
||||||
|
clone_repo "$reponame" "$reponame"
|
||||||
|
|
||||||
|
git lfs track "*.dat"
|
||||||
|
git add .gitattributes
|
||||||
|
git commit -m "initial commit"
|
||||||
|
|
||||||
|
present="present"
|
||||||
|
present_oid="$(calc_oid "$present")"
|
||||||
|
printf "$present" > present.dat
|
||||||
|
|
||||||
|
missing="missing"
|
||||||
|
missing_oid="$(calc_oid "$missing")"
|
||||||
|
printf "$missing" > missing.dat
|
||||||
|
|
||||||
|
git add missing.dat present.dat
|
||||||
|
git commit -m "add objects"
|
||||||
|
|
||||||
|
git rm missing.dat
|
||||||
|
git commit -m "remove missing"
|
||||||
|
|
||||||
|
# :fire: the "missing" object
|
||||||
|
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
||||||
|
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
||||||
|
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
||||||
|
rm "$missing_oid_path"
|
||||||
|
|
||||||
|
git config "lfs.allowincompletepush" "false"
|
||||||
|
|
||||||
|
git push origin master 2>&1 | tee push.log
|
||||||
|
if [ "1" -ne "${PIPESTATUS[0]}" ]; then
|
||||||
|
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
grep "no such file or directory" push.log || # unix
|
||||||
|
grep "cannot find the file" push.log # windows
|
||||||
|
grep "failed to push some refs" push.log
|
||||||
|
|
||||||
|
refute_server_object "$reponame" "$present_oid"
|
||||||
|
refute_server_object "$reponame" "$missing_oid"
|
||||||
|
)
|
||||||
|
end_test
|
||||||
|
|
||||||
|
begin_test "push missing objects"
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
|
||||||
|
reponame="push-missing-objects"
|
||||||
|
setup_remote_repo "$reponame"
|
||||||
|
clone_repo "$reponame" "$reponame"
|
||||||
|
|
||||||
|
git lfs track "*.dat"
|
||||||
|
git add .gitattributes
|
||||||
|
git commit -m "initial commit"
|
||||||
|
|
||||||
|
missing="missing"
|
||||||
|
missing_oid="$(calc_oid "$missing")"
|
||||||
|
missing_len="$(printf "$missing" | wc -c | awk '{ print $1 }')"
|
||||||
|
printf "$missing" > missing.dat
|
||||||
|
git add missing.dat
|
||||||
|
git commit -m "add missing.dat"
|
||||||
|
|
||||||
|
present="present"
|
||||||
|
present_oid="$(calc_oid "$present")"
|
||||||
|
present_len="$(printf "$present" | wc -c | awk '{ print $1 }')"
|
||||||
|
printf "$present" > present.dat
|
||||||
|
git add present.dat
|
||||||
|
git commit -m "add present.dat"
|
||||||
|
|
||||||
|
assert_local_object "$missing_oid" "$missing_len"
|
||||||
|
assert_local_object "$present_oid" "$present_len"
|
||||||
|
|
||||||
|
delete_local_object "$missing_oid"
|
||||||
|
|
||||||
|
refute_local_object "$missing_oid"
|
||||||
|
assert_local_object "$present_oid" "$present_len"
|
||||||
|
|
||||||
|
git config lfs.allowincompletepush false
|
||||||
|
|
||||||
|
git push origin master 2>&1 | tee push.log
|
||||||
|
|
||||||
|
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
|
||||||
|
echo >&2 "fatal: expected 'git push origin master' to exit with non-zero code"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
grep "LFS upload failed:" push.log
|
||||||
|
grep " (missing) missing.dat ($missing_oid)" push.log
|
||||||
|
|
||||||
|
refute_server_object "$reponame" "$missing_oid"
|
||||||
|
assert_server_object "$reponame" "$present_oid"
|
||||||
|
)
|
||||||
|
end_test
|
||||||
|
|
||||||
|
begin_test "push corrupt objects"
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
|
||||||
|
reponame="push-corrupt-objects"
|
||||||
|
setup_remote_repo "$reponame"
|
||||||
|
clone_repo "$reponame" "$reponame"
|
||||||
|
|
||||||
|
git lfs track "*.dat"
|
||||||
|
git add .gitattributes
|
||||||
|
git commit -m "initial commit"
|
||||||
|
|
||||||
|
corrupt="corrupt"
|
||||||
|
corrupt_oid="$(calc_oid "$corrupt")"
|
||||||
|
corrupt_len="$(printf "$corrupt" | wc -c | awk '{ print $1 }')"
|
||||||
|
printf "$corrupt" > corrupt.dat
|
||||||
|
git add corrupt.dat
|
||||||
|
git commit -m "add corrupt.dat"
|
||||||
|
|
||||||
|
present="present"
|
||||||
|
present_oid="$(calc_oid "$present")"
|
||||||
|
present_len="$(printf "$present" | wc -c | awk '{ print $1 }')"
|
||||||
|
printf "$present" > present.dat
|
||||||
|
git add present.dat
|
||||||
|
git commit -m "add present.dat"
|
||||||
|
|
||||||
|
assert_local_object "$corrupt_oid" "$corrupt_len"
|
||||||
|
assert_local_object "$present_oid" "$present_len"
|
||||||
|
|
||||||
|
corrupt_local_object "$corrupt_oid"
|
||||||
|
|
||||||
|
refute_local_object "$corrupt_oid" "$corrupt_len"
|
||||||
|
assert_local_object "$present_oid" "$present_len"
|
||||||
|
|
||||||
|
git config lfs.allowincompletepush false
|
||||||
|
|
||||||
|
git push origin master 2>&1 | tee push.log
|
||||||
|
|
||||||
|
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
|
||||||
|
echo >&2 "fatal: expected 'git push origin master' to exit with non-zero code"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
grep "LFS upload failed:" push.log
|
||||||
|
grep " (corrupt) corrupt.dat ($corrupt_oid)" push.log
|
||||||
|
|
||||||
|
refute_server_object "$reponame" "$corrupt_oid"
|
||||||
|
assert_server_object "$reponame" "$present_oid"
|
||||||
|
)
|
||||||
|
end_test
|
@ -1,66 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
. "test/testlib.sh"
|
|
||||||
|
|
||||||
begin_test "push missing objects"
|
|
||||||
(
|
|
||||||
set -e
|
|
||||||
|
|
||||||
reponame="push-missing-objects"
|
|
||||||
setup_remote_repo "$reponame"
|
|
||||||
clone_repo "$reponame" "$reponame"
|
|
||||||
|
|
||||||
git lfs track "*.dat"
|
|
||||||
git add .gitattributes
|
|
||||||
git commit -m "initial commit"
|
|
||||||
|
|
||||||
missing="missing"
|
|
||||||
missing_oid="$(calc_oid "$missing")"
|
|
||||||
missing_len="$(printf "$missing" | wc -c | awk '{ print $1 }')"
|
|
||||||
printf "$missing" > missing.dat
|
|
||||||
git add missing.dat
|
|
||||||
git commit -m "add missing.dat"
|
|
||||||
|
|
||||||
corrupt="corrupt"
|
|
||||||
corrupt_oid="$(calc_oid "$corrupt")"
|
|
||||||
corrupt_len="$(printf "$corrupt" | wc -c | awk '{ print $1 }')"
|
|
||||||
printf "$corrupt" > corrupt.dat
|
|
||||||
git add corrupt.dat
|
|
||||||
git commit -m "add corrupt.dat"
|
|
||||||
|
|
||||||
present="present"
|
|
||||||
present_oid="$(calc_oid "$present")"
|
|
||||||
present_len="$(printf "$present" | wc -c | awk '{ print $1 }')"
|
|
||||||
printf "$present" > present.dat
|
|
||||||
git add present.dat
|
|
||||||
git commit -m "add present.dat"
|
|
||||||
|
|
||||||
assert_local_object "$missing_oid" "$missing_len"
|
|
||||||
assert_local_object "$corrupt_oid" "$corrupt_len"
|
|
||||||
assert_local_object "$present_oid" "$present_len"
|
|
||||||
|
|
||||||
delete_local_object "$missing_oid"
|
|
||||||
corrupt_local_object "$corrupt_oid"
|
|
||||||
|
|
||||||
refute_local_object "$missing_oid"
|
|
||||||
refute_local_object "$corrupt_oid" "$corrupt_len"
|
|
||||||
assert_local_object "$present_oid" "$present_len"
|
|
||||||
|
|
||||||
git config lfs.allowincompletepush false
|
|
||||||
|
|
||||||
git push origin master 2>&1 | tee push.log
|
|
||||||
|
|
||||||
if [ "0" -eq "${PIPESTATUS[0]}" ]; then
|
|
||||||
echo >&2 "fatal: expected 'git push origin master' to exit with non-zero code"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
grep "LFS upload failed:" push.log
|
|
||||||
grep " (missing) missing.dat ($missing_oid)" push.log
|
|
||||||
grep " (corrupt) corrupt.dat ($corrupt_oid)" push.log
|
|
||||||
|
|
||||||
refute_server_object "$reponame" "$missing_oid"
|
|
||||||
refute_server_object "$reponame" "$corrupt_oid"
|
|
||||||
assert_server_object "$reponame" "$present_oid"
|
|
||||||
)
|
|
||||||
end_test
|
|
@ -661,98 +661,4 @@ begin_test "push with deprecated _links"
|
|||||||
|
|
||||||
assert_server_object "$reponame" "$contents_oid"
|
assert_server_object "$reponame" "$contents_oid"
|
||||||
)
|
)
|
||||||
|
|
||||||
begin_test "push with missing objects (lfs.allowincompletepush=t)"
|
|
||||||
(
|
|
||||||
set -e
|
|
||||||
|
|
||||||
reponame="push-with-missing-objects"
|
|
||||||
setup_remote_repo "$reponame"
|
|
||||||
clone_repo "$reponame" "$reponame"
|
|
||||||
|
|
||||||
git lfs track "*.dat"
|
|
||||||
git add .gitattributes
|
|
||||||
git commit -m "initial commit"
|
|
||||||
|
|
||||||
present="present"
|
|
||||||
present_oid="$(calc_oid "$present")"
|
|
||||||
printf "$present" > present.dat
|
|
||||||
|
|
||||||
missing="missing"
|
|
||||||
missing_oid="$(calc_oid "$missing")"
|
|
||||||
printf "$missing" > missing.dat
|
|
||||||
|
|
||||||
git add missing.dat present.dat
|
|
||||||
git commit -m "add objects"
|
|
||||||
|
|
||||||
git rm missing.dat
|
|
||||||
git commit -m "remove missing"
|
|
||||||
|
|
||||||
# :fire: the "missing" object
|
|
||||||
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
|
||||||
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
|
||||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
|
||||||
rm "$missing_oid_path"
|
|
||||||
|
|
||||||
git push origin master 2>&1 | tee push.log
|
|
||||||
if [ "0" -ne "${PIPESTATUS[0]}" ]; then
|
|
||||||
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
grep "LFS upload missing objects" push.log
|
|
||||||
grep " (missing) missing.dat ($missing_oid)" push.log
|
|
||||||
|
|
||||||
assert_server_object "$reponame" "$present_oid"
|
|
||||||
refute_server_object "$reponame" "$missing_oid"
|
|
||||||
)
|
|
||||||
end_test
|
|
||||||
|
|
||||||
begin_test "push reject missing objects (lfs.allowincompletepush=f)"
|
|
||||||
(
|
|
||||||
set -e
|
|
||||||
|
|
||||||
reponame="push-reject-missing-objects"
|
|
||||||
setup_remote_repo "$reponame"
|
|
||||||
clone_repo "$reponame" "$reponame"
|
|
||||||
|
|
||||||
git lfs track "*.dat"
|
|
||||||
git add .gitattributes
|
|
||||||
git commit -m "initial commit"
|
|
||||||
|
|
||||||
present="present"
|
|
||||||
present_oid="$(calc_oid "$present")"
|
|
||||||
printf "$present" > present.dat
|
|
||||||
|
|
||||||
missing="missing"
|
|
||||||
missing_oid="$(calc_oid "$missing")"
|
|
||||||
printf "$missing" > missing.dat
|
|
||||||
|
|
||||||
git add missing.dat present.dat
|
|
||||||
git commit -m "add objects"
|
|
||||||
|
|
||||||
git rm missing.dat
|
|
||||||
git commit -m "remove missing"
|
|
||||||
|
|
||||||
# :fire: the "missing" object
|
|
||||||
missing_oid_part_1="$(echo "$missing_oid" | cut -b 1-2)"
|
|
||||||
missing_oid_part_2="$(echo "$missing_oid" | cut -b 3-4)"
|
|
||||||
missing_oid_path=".git/lfs/objects/$missing_oid_part_1/$missing_oid_part_2/$missing_oid"
|
|
||||||
rm "$missing_oid_path"
|
|
||||||
|
|
||||||
git config "lfs.allowincompletepush" "false"
|
|
||||||
|
|
||||||
git push origin master 2>&1 | tee push.log
|
|
||||||
if [ "1" -ne "${PIPESTATUS[0]}" ]; then
|
|
||||||
echo >&2 "fatal: expected \`git push origin master\` to succeed ..."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
grep "no such file or directory" push.log || # unix
|
|
||||||
grep "cannot find the file" push.log # windows
|
|
||||||
grep "failed to push some refs" push.log
|
|
||||||
|
|
||||||
refute_server_object "$reponame" "$present_oid"
|
|
||||||
refute_server_object "$reponame" "$missing_oid"
|
|
||||||
)
|
|
||||||
end_test
|
end_test
|
||||||
|
Loading…
Reference in New Issue
Block a user