From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Fri, 5 Aug 2022 09:55:52 +0000 (+0200)
Subject: regress: fix test instability
X-Git-Tag: REL_12_12~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ad4c1f419477a3a450ecaa6b3a367c227a7df66;p=thirdparty%2Fpostgresql.git

regress: fix test instability

Having additional triggers in a test table made the ORDER BY clauses in
old queries underspecified.  Add another column there for stability.

Per sporadic buildfarm pink.
---

diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 49c5ccfbd6e..799f58dac81 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -2536,7 +2536,7 @@ create trigger tg_stmt after insert on parent
   for statement execute procedure trig_nothing();
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
  tgrelid | tgname  | tgenabled 
 ---------+---------+-----------
  child1  | tg      | O
@@ -2548,7 +2548,7 @@ alter table only parent enable always trigger tg;	-- no recursion because ONLY
 alter table parent enable always trigger tg_stmt;	-- no recursion because statement trigger
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
  tgrelid | tgname  | tgenabled 
 ---------+---------+-----------
  child1  | tg      | O
@@ -2561,7 +2561,7 @@ select tgrelid::regclass, tgname, tgenabled from pg_trigger
 alter table parent enable always trigger tg;
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
  tgrelid | tgname  | tgenabled 
 ---------+---------+-----------
  child1  | tg      | A
diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index fa0a2455524..98911b989a2 100644
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -1754,18 +1754,18 @@ create trigger tg_stmt after insert on parent
   for statement execute procedure trig_nothing();
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
 alter table only parent enable always trigger tg;	-- no recursion because ONLY
 alter table parent enable always trigger tg_stmt;	-- no recursion because statement trigger
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
 -- The following is a no-op for the parent trigger but not so
 -- for the child trigger, so recursion should be applied.
 alter table parent enable always trigger tg;
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
 drop table parent, child1;
 
 -- Verify that firing state propagates correctly on creation, too