summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gustafsson2022-03-31 09:16:16 +0000
committerDaniel Gustafsson2022-03-31 09:16:16 +0000
commit2beb4acff1e83fef6766a5a7d5bbd952444a0b36 (patch)
tree85cc0c9fdeb3a632d30f400161c357a18fcac492
parent8f2e2bbf145384784bad07a96d461c6bbd91f597 (diff)
Add diagnostic output on error in pump_until
When pump_until was moved to Utils.pm in commit 6da65a3f9 the diag calls were removed, this puts them back. Per request from Andres Freund. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/test/perl/PostgreSQL/Test/Utils.pm12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/test/perl/PostgreSQL/Test/Utils.pm b/src/test/perl/PostgreSQL/Test/Utils.pm
index 15b314d1f8..dca1b3b17c 100644
--- a/src/test/perl/PostgreSQL/Test/Utils.pm
+++ b/src/test/perl/PostgreSQL/Test/Utils.pm
@@ -426,8 +426,16 @@ sub pump_until
while (1)
{
last if $$stream =~ /$until/;
- return 0 if ($timeout->is_expired);
- return 0 if (not $proc->pumpable());
+ if ($timeout->is_expired)
+ {
+ diag("pump_until: timeout expired when searching for \"$until\" with stream: \"$$stream\"");
+ return 0;
+ }
+ if (not $proc->pumpable())
+ {
+ diag("pump_until: process terminated unexpectedly when searching for \"$until\" with stream: \"$$stream\"");
+ return 0;
+ }
$proc->pump();
}
return 1;