summaryrefslogtreecommitdiff
path: root/t/t9805-git-p4-skip-submit-edit.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-03-13 12:24:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-14 03:34:39 (GMT)
commit99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90 (patch)
tree076fe8d2aca0a40245948b5e40bd66a82845a3df /t/t9805-git-p4-skip-submit-edit.sh
parent3bc2702b883030b138a8c7585d7bc9adb4b4a399 (diff)
downloadgit-99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90.zip
git-99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90.tar.gz
git-99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90.tar.bz2
git p4 test: use 'test_atexit' to kill p4d and the watchdog process
Use 'test_atexit' to run cleanup commands to stop 'p4d' at the end of the test script or upon interrupt or failure, as it is shorter, simpler, and more robust than registering such cleanup commands in the trap on EXIT in the test scripts. Note that one of the test scripts, 't9801-git-p4-branch.sh', stops and then re-starts 'p4d' twice in the middle of the script; take care that the cleanup functions to stop 'p4d' are only registered once. Note also that 'git p4' tests invoke different functions in the trap on EXIT ('cleanup') and in the last test before 'test_done' ('kill_p4d'). Register both of these functions with 'test_atexit' for now, and a a later patch in this series will then clean up the redundancy. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9805-git-p4-skip-submit-edit.sh')
-rwxr-xr-xt/t9805-git-p4-skip-submit-edit.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 5fbf904..90ef647 100755
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -98,8 +98,4 @@ test_expect_success 'no config, edited' '
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done