Remove dependency on error ordering in isolation tests

We now report errors reported by the just-unblocked and unblocking
transactions identically; this should fix relatively common buildfarm
failures reported by animals that are failing the "wrong" session.

5 files changed, 27 insertions, 137 deletions

diff --git a/src/test/isolation/expected/fk-deadlock.out b/src/test/isolation/expected/fk-deadlock.out
index 2f4f71122e..36813f11f5 100644
--- a/src/test/isolation/expected/fk-deadlock.out
+++ b/src/test/isolation/expected/fk-deadlock.out
@@ -23,7 +23,7 @@ step s2i: INSERT INTO child VALUES (2, 1);
 step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>
 step s2u: UPDATE parent SET aux = 'baz';
 step s1u: <... completed>
-ERROR:  deadlock detected
+error in steps s2u s1u: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -32,8 +32,8 @@ step s1i: INSERT INTO child VALUES (1, 1);
 step s2i: INSERT INTO child VALUES (2, 1);
 step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>
 step s1u: UPDATE parent SET aux = 'bar';
-ERROR:  deadlock detected
 step s2u: <... completed>
+error in steps s1u s2u: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -43,7 +43,7 @@ step s1i: INSERT INTO child VALUES (1, 1);
 step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>
 step s2u: UPDATE parent SET aux = 'baz';
 step s1u: <... completed>
-ERROR:  deadlock detected
+error in steps s2u s1u: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -52,8 +52,8 @@ step s2i: INSERT INTO child VALUES (2, 1);
 step s1i: INSERT INTO child VALUES (1, 1);
 step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>
 step s1u: UPDATE parent SET aux = 'bar';
-ERROR:  deadlock detected
 step s2u: <... completed>
+error in steps s1u s2u: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
diff --git a/src/test/isolation/expected/fk-deadlock2.out b/src/test/isolation/expected/fk-deadlock2.out
index 1801540816..2d8e5e5b25 100644
--- a/src/test/isolation/expected/fk-deadlock2.out
+++ b/src/test/isolation/expected/fk-deadlock2.out
@@ -23,7 +23,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -33,7 +33,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -42,8 +42,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -52,8 +52,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -63,7 +63,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -73,7 +73,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -82,8 +82,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -92,8 +92,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
diff --git a/src/test/isolation/expected/fk-deadlock2_1.out b/src/test/isolation/expected/fk-deadlock2_1.out
index 8ccc24a2ab..30c4c99863 100644
--- a/src/test/isolation/expected/fk-deadlock2_1.out
+++ b/src/test/isolation/expected/fk-deadlock2_1.out
@@ -14,7 +14,7 @@ step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1c: COMMIT;
 step s2u1: <... completed>
-ERROR:  could not serialize access due to concurrent update
+error in steps s1c s2u1: ERROR:  could not serialize access due to concurrent update
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 step s2c: COMMIT;
@@ -25,7 +25,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -35,7 +35,7 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -44,8 +44,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -54,8 +54,8 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -65,7 +65,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -75,7 +75,7 @@ step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u2: <... completed>
-ERROR:  deadlock detected
+error in steps s2u2 s1u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -84,8 +84,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -94,8 +94,8 @@ step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
 step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
 step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
 step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
 step s2u2: <... completed>
+error in steps s1u2 s2u2: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
diff --git a/src/test/isolation/expected/fk-deadlock2_2.out b/src/test/isolation/expected/fk-deadlock2_2.out
deleted file mode 100644
index d61b1ed471..0000000000
--- a/src/test/isolation/expected/fk-deadlock2_2.out
+++ /dev/null
@@ -1,110 +0,0 @@
-Parsed test spec with 2 sessions
-
-starting permutation: s1u1 s1u2 s1c s2u1 s2u2 s2c
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1c: COMMIT;
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s2c: COMMIT;
-
-starting permutation: s1u1 s1u2 s2u1 s1c s2u2 s2c
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s1c: COMMIT;
-step s2u1: <... completed>
-ERROR:  could not serialize access due to concurrent update
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-step s2c: COMMIT;
-
-starting permutation: s1u1 s2u1 s1u2 s2u2 s1c s2c
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u2: <... completed>
-ERROR:  deadlock detected
-step s1c: COMMIT;
-step s2c: COMMIT;
-
-starting permutation: s1u1 s2u1 s1u2 s2u2 s2c s1c
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u2: <... completed>
-ERROR:  deadlock detected
-step s2c: COMMIT;
-step s1c: COMMIT;
-
-starting permutation: s1u1 s2u1 s2u2 s1u2 s1c s2c
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
-step s2u2: <... completed>
-step s1c: COMMIT;
-step s2c: COMMIT;
-
-starting permutation: s1u1 s2u1 s2u2 s1u2 s2c s1c
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
-step s2u2: <... completed>
-step s2c: COMMIT;
-step s1c: COMMIT;
-
-starting permutation: s2u1 s1u1 s1u2 s2u2 s1c s2c
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u2: <... completed>
-ERROR:  deadlock detected
-step s1c: COMMIT;
-step s2c: COMMIT;
-
-starting permutation: s2u1 s1u1 s1u2 s2u2 s2c s1c
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u2: <... completed>
-ERROR:  deadlock detected
-step s2c: COMMIT;
-step s1c: COMMIT;
-
-starting permutation: s2u1 s1u1 s2u2 s1u2 s1c s2c
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
-step s2u2: <... completed>
-step s1c: COMMIT;
-step s2c: COMMIT;
-
-starting permutation: s2u1 s1u1 s2u2 s1u2 s2c s1c
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  deadlock detected
-step s2u2: <... completed>
-step s2c: COMMIT;
-step s1c: COMMIT;
-
-starting permutation: s2u1 s2u2 s1u1 s2c s1u2 s1c
-step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1; <waiting ...>
-step s2c: COMMIT;
-step s1u1: <... completed>
-step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
-ERROR:  could not serialize access due to concurrent update
-step s1c: COMMIT;
diff --git a/src/test/isolation/expected/fk-deadlock_1.out b/src/test/isolation/expected/fk-deadlock_1.out
index 69540b0934..ca75322cc1 100644
--- a/src/test/isolation/expected/fk-deadlock_1.out
+++ b/src/test/isolation/expected/fk-deadlock_1.out
@@ -14,7 +14,7 @@ step s1u: UPDATE parent SET aux = 'bar';
 step s2i: INSERT INTO child VALUES (2, 1); <waiting ...>
 step s1c: COMMIT;
 step s2i: <... completed>
-ERROR:  could not serialize access due to concurrent update
+error in steps s1c s2i: ERROR:  could not serialize access due to concurrent update
 step s2u: UPDATE parent SET aux = 'baz';
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 step s2c: COMMIT;
@@ -25,7 +25,7 @@ step s2i: INSERT INTO child VALUES (2, 1);
 step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>
 step s2u: UPDATE parent SET aux = 'baz';
 step s1u: <... completed>
-ERROR:  deadlock detected
+error in steps s2u s1u: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -34,8 +34,8 @@ step s1i: INSERT INTO child VALUES (1, 1);
 step s2i: INSERT INTO child VALUES (2, 1);
 step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>
 step s1u: UPDATE parent SET aux = 'bar';
-ERROR:  deadlock detected
 step s2u: <... completed>
+error in steps s1u s2u: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -45,7 +45,7 @@ step s1i: INSERT INTO child VALUES (1, 1);
 step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>
 step s2u: UPDATE parent SET aux = 'baz';
 step s1u: <... completed>
-ERROR:  deadlock detected
+error in steps s2u s1u: ERROR:  deadlock detected
 step s1c: COMMIT;
 step s2c: COMMIT;
 
@@ -54,8 +54,8 @@ step s2i: INSERT INTO child VALUES (2, 1);
 step s1i: INSERT INTO child VALUES (1, 1);
 step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>
 step s1u: UPDATE parent SET aux = 'bar';
-ERROR:  deadlock detected
 step s2u: <... completed>
+error in steps s1u s2u: ERROR:  deadlock detected
 step s2c: COMMIT;
 step s1c: COMMIT;
 
@@ -65,7 +65,7 @@ step s2u: UPDATE parent SET aux = 'baz';
 step s1i: INSERT INTO child VALUES (1, 1); <waiting ...>
 step s2c: COMMIT;
 step s1i: <... completed>
-ERROR:  could not serialize access due to concurrent update
+error in steps s2c s1i: ERROR:  could not serialize access due to concurrent update
 step s1u: UPDATE parent SET aux = 'bar';
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 step s1c: COMMIT;