From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 6 Sep 2021 20:14:49 +0000 (-0400)
Subject: Further fix psql query-cancel test.
X-Git-Tag: REL_15_BETA1~1543
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd5846e4a9c1338ded5efcef53511f0d71f53f0e;p=thirdparty%2Fpostgresql.git

Further fix psql query-cancel test.

The query to wait for pg_sleep to be running did no such thing,
because the regex pattern it used could match itself.

Report: https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=conchuela&dt=2021-09-06%2018%3A00%3A20
---

diff --git a/src/bin/psql/t/020_cancel.pl b/src/bin/psql/t/020_cancel.pl
index b3edaaf35d0..0ca8e1743db 100644
--- a/src/bin/psql/t/020_cancel.pl
+++ b/src/bin/psql/t/020_cancel.pl
@@ -53,7 +53,7 @@ SKIP: {
 	# Send sleep command and wait until the server has registered it
 	$stdin = "select pg_sleep(180);\n";
 	pump $h while length $stdin;
-	$node->poll_query_until('postgres', q{SELECT (SELECT count(*) FROM pg_stat_activity WHERE query ~ 'pg_sleep') > 0;})
+	$node->poll_query_until('postgres', q{SELECT (SELECT count(*) FROM pg_stat_activity WHERE query ~ '^select pg_sleep') > 0;})
 	  or die "timed out";
 
 	# Send cancel request