aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2020-03-11 18:23:57 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2020-03-11 18:24:14 -0400
commit13f353b0e0775642c212ac557b371eefa171d179 (patch)
treeee4764e3fbe1c3b9f35460d3691eb096eb6d705c
parentc788115b5eb50d666023aa6f6e7faee21288401c (diff)
downloadpostgresql-13f353b0e0775642c212ac557b371eefa171d179.tar.gz
postgresql-13f353b0e0775642c212ac557b371eefa171d179.zip
Fix test case instability introduced in 085b6b667.
I forgot that the WAL directory might hold other files besides WAL segments, notably including new segments still being filled. That means a blind test for the first file's size being 16MB can fail. Restrict based on file name length to make it more robust. Per buildfarm.
-rw-r--r--src/test/regress/expected/misc_functions.out3
-rw-r--r--src/test/regress/sql/misc_functions.sql3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/regress/expected/misc_functions.out b/src/test/regress/expected/misc_functions.out
index a1ee4dbb3b5..b65f0849098 100644
--- a/src/test/regress/expected/misc_functions.out
+++ b/src/test/regress/expected/misc_functions.out
@@ -167,7 +167,8 @@ select count(*) > 0 as ok from (select * from pg_ls_waldir() limit 1) ss;
t
(1 row)
-select (pg_ls_waldir()).size = :segsize as ok limit 1;
+select (w).size = :segsize as ok
+from (select pg_ls_waldir() w) ss where length((w).name) = 24 limit 1;
ok
----
t
diff --git a/src/test/regress/sql/misc_functions.sql b/src/test/regress/sql/misc_functions.sql
index 795587e70f6..b65cd961fcc 100644
--- a/src/test/regress/sql/misc_functions.sql
+++ b/src/test/regress/sql/misc_functions.sql
@@ -46,4 +46,5 @@ select count(*) > 0 as ok from (select pg_ls_waldir()) ss;
-- Test not-run-to-completion cases.
select * from pg_ls_waldir() limit 0;
select count(*) > 0 as ok from (select * from pg_ls_waldir() limit 1) ss;
-select (pg_ls_waldir()).size = :segsize as ok limit 1;
+select (w).size = :segsize as ok
+from (select pg_ls_waldir() w) ss where length((w).name) = 24 limit 1;