fixup! git-p4: use test_atexit to kill the daemon

dscho · dscho · commit d24a56103278 · 2018-12-13T15:16:57.000+01:00
Turns out that there are problems with that approach that are totally
not related to Azure Pipelines, so in order to focus on the latter,
let's skip the test_atexit patches for now.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
@@ -74,6 +74,15 @@ cli="$TRASH_DIRECTORY/cli"
 git="$TRASH_DIRECTORY/git"
 pidfile="$TRASH_DIRECTORY/p4d.pid"
 
+# Sometimes "prove" seems to hang on exit because p4d is still running
+cleanup () {
+	if test -f "$pidfile"
+	then
+		kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
+	fi
+}
+trap cleanup EXIT
+
 # git p4 submit generates a temp file, which will
 # not get cleaned up if the submission fails.  Don't
 # clutter up /tmp on the test machine.
@@ -132,7 +141,6 @@ start_p4d () {
 		# p4d failed to start
 		return 1
 	fi
-	test_atexit kill_p4d
 
 	# build a p4 user so author@example.com has an entry
 	p4_add_user author
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
@@ -138,7 +138,6 @@ check_sub_test_lib_test_err () {
 	)
 }
 
-cat >/dev/null <<\DDD
 test_expect_success 'pretend we have a fully passing test suite' "
 	run_sub_test_lib_test full-pass '3 passing tests' <<-\\EOF &&
 	for i in 1 2 3
@@ -825,7 +824,6 @@ test_expect_success 'tests clean up even on failures' "
 	> 1..2
 	EOF
 "
-DDD
 
 test_expect_success 'test_atexit is run' "
 	test_must_fail run_sub_test_lib_test \
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
@@ -326,4 +326,8 @@ test_expect_success 'submit from worktree' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
@@ -610,4 +610,8 @@ test_expect_success 'Update a file in git side and submit to P4 using client vie
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
@@ -333,4 +333,8 @@ test_expect_success SYMLINKS 'empty symlink target' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9803-git-p4-shell-metachars.sh b/t/t9803-git-p4-shell-metachars.sh
@@ -105,4 +105,8 @@ test_expect_success 'branch with shell char' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9804-git-p4-label.sh b/t/t9804-git-p4-label.sh
@@ -108,4 +108,8 @@ test_expect_failure 'two labels on the same changelist' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
@@ -98,4 +98,8 @@ test_expect_success 'no config, edited' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
@@ -300,4 +300,9 @@ test_expect_success 'use --git-dir option and GIT_DIR' '
 	test_path_is_file "$git"/cli_file2.t
 '
 
+
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
@@ -542,4 +542,8 @@ test_expect_success 'submit --update-shelve' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
@@ -83,4 +83,8 @@ test_expect_success SYMLINKS 'p4 client root symlink should stay symbolic' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
@@ -836,4 +836,8 @@ test_expect_success 'quotes on both sides' '
 	git_verify "cdir 1/file11" "cdir 1/file12"
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
@@ -360,4 +360,8 @@ test_expect_failure 'Add keywords in git which do not match the default p4 value
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
@@ -259,4 +259,9 @@ test_expect_success 'importing labels with missing revisions' '
 	)
 '
 
+
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh
@@ -211,4 +211,8 @@ test_expect_success 'wildcard files requiring keyword scrub' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh
@@ -138,4 +138,8 @@ test_expect_success 'not preserving user with mixed authorship' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
@@ -242,4 +242,8 @@ test_expect_success P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW \
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
@@ -422,4 +422,8 @@ test_expect_success 'cleanup chmod after submit cancel' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
@@ -138,4 +138,8 @@ test_expect_failure 'move with lock taken' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9817-git-p4-exclude.sh b/t/t9817-git-p4-exclude.sh
@@ -64,4 +64,8 @@ test_expect_success 'clone, then sync with exclude' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
@@ -146,4 +146,8 @@ test_expect_success 'Clone repo with self-sizing block size' '
 	test_line_count \> 10 log
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
@@ -53,4 +53,8 @@ test_expect_failure 'Clone UC repo with lc name' '
 	test_must_fail git p4 clone //depot/uc/...
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9820-git-p4-editor-handling.sh b/t/t9820-git-p4-editor-handling.sh
@@ -31,4 +31,8 @@ test_expect_success 'EDITOR with options' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9821-git-p4-path-variations.sh b/t/t9821-git-p4-path-variations.sh
@@ -193,4 +193,8 @@ test_expect_success 'Add a new file and clone path with new file (ignorecase)' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
@@ -67,4 +67,8 @@ test_expect_success 'Delete iso8859-1 encoded paths and clone' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9823-git-p4-mock-lfs.sh b/t/t9823-git-p4-mock-lfs.sh
@@ -185,4 +185,8 @@ test_expect_success 'Run git p4 submit in repo configured with large file system
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh
@@ -287,4 +287,8 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9825-git-p4-handle-utf16-without-bom.sh b/t/t9825-git-p4-handle-utf16-without-bom.sh
@@ -43,4 +43,8 @@ test_expect_failure 'clone depot with invalid UTF-16 file in non-verbose mode' '
 	git p4 clone --dest="$git" //depot
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9826-git-p4-keep-empty-commits.sh b/t/t9826-git-p4-keep-empty-commits.sh
@@ -127,4 +127,8 @@ test_expect_success 'Clone repo subdir with all history' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9827-git-p4-change-filetype.sh b/t/t9827-git-p4-change-filetype.sh
@@ -59,4 +59,8 @@ test_expect_success SYMLINKS 'change symbolic link to file' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9828-git-p4-map-user.sh b/t/t9828-git-p4-map-user.sh
@@ -54,4 +54,8 @@ test_expect_success 'Clone repo root path with all history' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9829-git-p4-jobs.sh b/t/t9829-git-p4-jobs.sh
@@ -92,4 +92,8 @@ test_expect_success 'check log message of changelist with more jobs' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9830-git-p4-symlink-dir.sh b/t/t9830-git-p4-symlink-dir.sh
@@ -36,4 +36,8 @@ test_expect_success 'symlinked directory' '
 
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
@@ -96,4 +96,8 @@ test_expect_success 'submit description with extra info lines from verbose p4 ch
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
@@ -174,5 +174,8 @@ test_expect_success 'unshelve specifying the origin' '
 		test_path_is_file file_to_shelve
 	)
 '
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
 
 test_done
diff --git a/t/t9833-errors.sh b/t/t9833-errors.sh
@@ -72,4 +72,9 @@ test_expect_success 'git operation with expired ticket' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ check_sub_test_lib_test_err () {`
`138`	`138`	`)`
`139`	`139`	`}`
`140`	`140`
`141`		`-cat >/dev/null <<\DDD`
`142`	`141`	`test_expect_success 'pretend we have a fully passing test suite' "`
`143`	`142`	`run_sub_test_lib_test full-pass '3 passing tests' <<-\\EOF &&`
`144`	`143`	`for i in 1 2 3`
`@@ -825,7 +824,6 @@ test_expect_success 'tests clean up even on failures' "`
`825`	`824`	`> 1..2`
`826`	`825`	`EOF`
`827`	`826`	`"`
`828`		`-DDD`
`829`	`827`
`830`	`828`	`test_expect_success 'test_atexit is run' "`
`831`	`829`	`test_must_fail run_sub_test_lib_test \`
Original file line number	Diff line number	Diff line change
`@@ -326,4 +326,8 @@ test_expect_success 'submit from worktree' '`
`326`	`326`	`)`
`327`	`327`	`'`
`328`	`328`
	`329`	`+test_expect_success 'kill p4d' '`
	`330`	`+ kill_p4d`
	`331`	`+'`
	`332`	`+`
`329`	`333`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -610,4 +610,8 @@ test_expect_success 'Update a file in git side and submit to P4 using client vie`
`610`	`610`	`)`
`611`	`611`	`'`
`612`	`612`
	`613`	`+test_expect_success 'kill p4d' '`
	`614`	`+ kill_p4d`
	`615`	`+'`
	`616`	`+`
`613`	`617`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -333,4 +333,8 @@ test_expect_success SYMLINKS 'empty symlink target' '`
`333`	`333`	`)`
`334`	`334`	`'`
`335`	`335`
	`336`	`+test_expect_success 'kill p4d' '`
	`337`	`+ kill_p4d`
	`338`	`+'`
	`339`	`+`
`336`	`340`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,8 @@ test_expect_success 'branch with shell char' '`
`105`	`105`	`)`
`106`	`106`	`'`
`107`	`107`
	`108`	`+test_expect_success 'kill p4d' '`
	`109`	`+ kill_p4d`
	`110`	`+'`
	`111`	`+`
`108`	`112`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -108,4 +108,8 @@ test_expect_failure 'two labels on the same changelist' '`
`108`	`108`	`)`
`109`	`109`	`'`
`110`	`110`
	`111`	`+test_expect_success 'kill p4d' '`
	`112`	`+ kill_p4d`
	`113`	`+'`
	`114`	`+`
`111`	`115`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -98,4 +98,8 @@ test_expect_success 'no config, edited' '`
`98`	`98`	`)`
`99`	`99`	`'`
`100`	`100`
	`101`	`+test_expect_success 'kill p4d' '`
	`102`	`+ kill_p4d`
	`103`	`+'`
	`104`	`+`
`101`	`105`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -300,4 +300,9 @@ test_expect_success 'use --git-dir option and GIT_DIR' '`
`300`	`300`	`test_path_is_file "$git"/cli_file2.t`
`301`	`301`	`'`
`302`	`302`
	`303`	`+`
	`304`	`+test_expect_success 'kill p4d' '`
	`305`	`+ kill_p4d`
	`306`	`+'`
	`307`	`+`
`303`	`308`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -542,4 +542,8 @@ test_expect_success 'submit --update-shelve' '`
`542`	`542`	`)`
`543`	`543`	`'`
`544`	`544`
	`545`	`+test_expect_success 'kill p4d' '`
	`546`	`+ kill_p4d`
	`547`	`+'`
	`548`	`+`
`545`	`549`	`test_done`