Add an ORDER BY to nail down the expected row order from a query that's

been shown to be sensitive to concurrent autovacuum.  Per Alvaro.

diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out
index 0eb83369fbbbd395f7a43439161ea39cb64bc8ed..9bf4764b689f8c2b3d4da03e09d02bb4f8327a53 100644 (file)
--- a/src/test/regress/expected/cluster.out
+++ b/src/test/regress/expected/cluster.out
@@ -249,11 +249,12 @@ SELECT a,b,c,substring(d for 30), length(d) from clstr_tst;
 INSERT INTO clstr_tst (b, c) VALUES (1111, 'this should fail');
 ERROR:  insert or update on table "clstr_tst" violates foreign key constraint "clstr_tst_con"
 DETAIL:  Key (b)=(1111) is not present in table "clstr_tst_s".
-SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass;
+SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass
+ORDER BY 1;
     conname     
 ----------------
- clstr_tst_pkey
  clstr_tst_con
+ clstr_tst_pkey
 (2 rows)
 
 SELECT relname, relkind,

diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql
index 8f4fc58912b7136b41d07b2443024341ef1524ed..a54d6e07f50cde7c562e0f4ea1ca76b5818aaf1f 100644 (file)
--- a/src/test/regress/sql/cluster.sql
+++ b/src/test/regress/sql/cluster.sql
@@ -73,7 +73,8 @@ SELECT a,b,c,substring(d for 30), length(d) from clstr_tst;
 -- Verify that foreign key link still works
 INSERT INTO clstr_tst (b, c) VALUES (1111, 'this should fail');
 
-SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass;
+SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass
+ORDER BY 1;
 
 
 SELECT relname, relkind,