t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'

szeder · gitster · commit decfe05bb668 · 2019-08-02T09:35:57.000-07:00
We have a couple of test scripts that are not completely
httpd-specific, but do run a few httpd-specific tests at the end.
These test scripts source 'lib-httpd.sh' somewhere mid-script, which
then skips all the rest of the test script if the dependencies for
running httpd tests are not fulfilled.

As the previous two patches in this series show, already on two
occasions non-httpd-specific tests were appended at the end of such
test scripts, and, consequently, they were skipped as well when httpd
tests couldn't be run.

Add a comment at the end of these test scripts to warn against adding
non-httpd-specific tests at the end, in the hope that they will help
prevent similar issues in the future.

Signed-off-by: SZEDER Gábor &lt;szeder.dev@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
@@ -518,4 +518,7 @@ test_expect_success 'fetching of missing objects from an HTTP server' '
 	git verify-pack --verbose "$IDX" | grep "$HASH"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
@@ -920,4 +920,7 @@ test_expect_success 'fetch with --filter=blob:limit=0 and HTTP' '
 	fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
@@ -255,4 +255,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
 	git -C client fsck
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
@@ -278,4 +278,7 @@ test_expect_success 'push options keep quoted characters intact (http)' '
 	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
@@ -739,4 +739,7 @@ test_expect_success 'partial clone using HTTP' '
 	partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
@@ -417,4 +417,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
@@ -292,4 +292,7 @@ test_expect_success 'push with http:// using protocol v1' '
 	grep "git< version 1" log
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
@@ -723,4 +723,7 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '
 	test_i18ngrep "expected no other sections to be sent after no .ready." err
 '
 
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -518,4 +518,7 @@ test_expect_success 'fetching of missing objects from an HTTP server' '`
`518`	`518`	`git verify-pack --verbose "$IDX" \| grep "$HASH"`
`519`	`519`	`'`
`520`	`520`
	`521`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`522`	`+# test script is only executed when httpd is available and enabled.`
	`523`	`+`
`521`	`524`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -920,4 +920,7 @@ test_expect_success 'fetch with --filter=blob:limit=0 and HTTP' '`
`920`	`920`	`fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"`
`921`	`921`	`'`
`922`	`922`
	`923`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`924`	`+# test script is only executed when httpd is available and enabled.`
	`925`	`+`
`923`	`926`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -255,4 +255,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f`
`255`	`255`	`git -C client fsck`
`256`	`256`	`'`
`257`	`257`
	`258`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`259`	`+# test script is only executed when httpd is available and enabled.`
	`260`	`+`
`258`	`261`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -278,4 +278,7 @@ test_expect_success 'push options keep quoted characters intact (http)' '`
`278`	`278`	`test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options`
`279`	`279`	`'`
`280`	`280`
	`281`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`282`	`+# test script is only executed when httpd is available and enabled.`
	`283`	`+`
`281`	`284`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -739,4 +739,7 @@ test_expect_success 'partial clone using HTTP' '`
`739`	`739`	`partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"`
`740`	`740`	`'`
`741`	`741`
	`742`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`743`	`+# test script is only executed when httpd is available and enabled.`
	`744`	`+`
`742`	`745`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -417,4 +417,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor`
`417`	`417`	`! test -e "$HTTPD_ROOT_PATH/one-time-sed"`
`418`	`418`	`'`
`419`	`419`
	`420`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`421`	`+# test script is only executed when httpd is available and enabled.`
	`422`	`+`
`420`	`423`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -292,4 +292,7 @@ test_expect_success 'push with http:// using protocol v1' '`
`292`	`292`	`grep "git< version 1" log`
`293`	`293`	`'`
`294`	`294`
	`295`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`296`	`+# test script is only executed when httpd is available and enabled.`
	`297`	`+`
`295`	`298`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -723,4 +723,7 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '`
`723`	`723`	`test_i18ngrep "expected no other sections to be sent after no .ready." err`
`724`	`724`	`'`
`725`	`725`
	`726`	`+# DO NOT add non-httpd-specific tests here, because the last part of this`
	`727`	`+# test script is only executed when httpd is available and enabled.`
	`728`	`+`
`726`	`729`	`test_done`