diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 09:41:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 09:41:12 +0200 |
| commit | 579b75ad9530827fe00740b8551963f16f279c40 (patch) | |
| tree | 9beebfa6f1162d688b034923b2ba3498cf6597e5 /t/t5700-protocol-v1.sh | |
| parent | Merge branch 'ag/sequencer-reduce-rewriting-todo' (diff) | |
| parent | t9811-git-p4-label-import: fix pipeline negation (diff) | |
| download | git-579b75ad9530827fe00740b8551963f16f279c40.tar.xz git-579b75ad9530827fe00740b8551963f16f279c40.zip | |
Merge branch 'sg/test-atexit'
Test framework update to more robustly clean up leftover files and
processes after tests are done.
* sg/test-atexit:
t9811-git-p4-label-import: fix pipeline negation
git p4 test: disable '-x' tracing in the p4d watchdog loop
git p4 test: simplify timeout handling
git p4 test: clean up the p4d cleanup functions
git p4 test: use 'test_atexit' to kill p4d and the watchdog process
t0301-credential-cache: use 'test_atexit' to stop the credentials helper
tests: use 'test_atexit' to stop httpd
git-daemon: use 'test_atexit` to stop 'git-daemon'
test-lib: introduce 'test_atexit'
t/lib-git-daemon: make sure to kill the 'git-daemon' process
test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
Diffstat (limited to 't/t5700-protocol-v1.sh')
| -rwxr-xr-x | t/t5700-protocol-v1.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh index d5ed196bfd..7c9511c593 100755 --- a/t/t5700-protocol-v1.sh +++ b/t/t5700-protocol-v1.sh @@ -292,6 +292,4 @@ test_expect_success 'push with http:// using protocol v1' ' grep "git< version 1" log ' -stop_httpd - test_done |