diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-03-11 18:23:57 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-03-11 18:24:11 -0400 |
| commit | a029a0641cce002acbb5e8ac6ec5533e599a9aea (patch) | |
| tree | aa46ebaf1f8147c65ef7511b0bf7361c61db5bc6 | |
| parent | b08dee24a5574ba6657d238b91c10f1f8e2608f8 (diff) | |
| download | postgresql-a029a0641cce002acbb5e8ac6ec5533e599a9aea.tar.gz postgresql-a029a0641cce002acbb5e8ac6ec5533e599a9aea.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.out | 3 | ||||
| -rw-r--r-- | src/test/regress/sql/misc_functions.sql | 3 |
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 5eccc97bdba..e217b678d78 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 02d1fc238d5..1e11eb35547 100644 --- a/src/test/regress/sql/misc_functions.sql +++ b/src/test/regress/sql/misc_functions.sql @@ -46,7 +46,8 @@ 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; select count(*) >= 0 as ok from pg_ls_archive_statusdir(); |