Fix TAP output format for failure in permutation tests.

diff --git a/src/test/regress/pg_dtester.py.in b/src/test/regress/pg_dtester.py.in
index f9a3f191ddec72799877bb05fdb20fe787da038e..861d254a0ca5165cfc0c1b137382e83496040ce4 100644 (file)
--- a/src/test/regress/pg_dtester.py.in
+++ b/src/test/regress/pg_dtester.py.in
@@ -676,6 +676,7 @@ class DatabasePermutationTest(PermutationTest):
                "Transactions we thought we knew how to recognize as safe resulted in a rollback..")
 
    def printStepResults(self, stepIdList):
+       print stepIdList,
        if self.serializationFailure:
            if self.commitRequired(stepIdList):
                print 'rolled back ??'
@@ -716,7 +717,6 @@ class SimpleWriteSkewTest(DatabasePermutationTest):
            }
 
    def setUpIteration(self, stepIdList):
-       print stepIdList,
        self.serializationFailure = False
        self.syncCall(10, self.conn1.operation, "UPDATE test SET t = 'apple' WHERE i = 5;", "UPDATE 1")
        self.syncCall(10, self.conn1.operation, "UPDATE test SET t = 'pear' WHERE i = 7;", "UPDATE 1")
@@ -766,7 +766,6 @@ class ReceiptReportTest(DatabasePermutationTest):
            }
 
    def setUpIteration(self, stepIdList):
-       print stepIdList,
        self.serializationFailure = False
        self.syncCall(10, self.conn1.operation, "DROP TABLE IF EXISTS ctl, receipt;")
        self.syncCall(10, self.conn1.operation, "CREATE TABLE ctl (k text NOT NULL PRIMARY KEY, deposit_date date NOT NULL);")
@@ -875,7 +874,6 @@ class TemporalRangeIntegrityTest(DatabasePermutationTest):
        self.syncCall(10, self.conn1.operation, "CREATE TABLE offense (offense_no int NOT NULL, statute_cite text NOT NULL, offense_date date NOT NULL, CONSTRAINT offense_pkey PRIMARY KEY (offense_no));", "CREATE TABLE")
        self.syncCall(10, self.conn1.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
        self.syncCall(10, self.conn2.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
-       print stepIdList,
 
    def tearDownIteration(self, stepIdList):
        self.syncCall(10, self.conn1.operation, "ROLLBACK;")
@@ -921,7 +919,6 @@ class ProjectManagerTest(DatabasePermutationTest):
        self.syncCall(10, self.conn1.operation, "CREATE TABLE project (project_no int NOT NULL PRIMARY KEY, description text NOT NULL, project_manager int NOT NULL);", "CREATE TABLE")
        self.syncCall(10, self.conn1.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
        self.syncCall(10, self.conn2.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
-       print stepIdList,
 
    def tearDownIteration(self, stepIdList):
        self.syncCall(10, self.conn1.operation, "ROLLBACK;")
@@ -966,7 +963,6 @@ class ClassroomSchedulingTest(DatabasePermutationTest):
        self.syncCall(10, self.conn1.operation, "INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 10:00', TIMESTAMP WITH TIME ZONE '2010-04-01 11:00', 'Bob');", "INSERT 0 1")
        self.syncCall(10, self.conn1.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
        self.syncCall(10, self.conn2.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
-       print stepIdList,
 
    def tearDownIteration(self, stepIdList):
        self.syncCall(10, self.conn1.operation, "ROLLBACK;")
@@ -1010,7 +1006,6 @@ class TotalCashTest(DatabasePermutationTest):
        self.syncCall(10, self.conn1.operation, "INSERT INTO accounts VALUES ('checking', 600),('savings',600);", "INSERT 0 2")
        self.syncCall(10, self.conn1.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
        self.syncCall(10, self.conn2.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
-       print stepIdList,
 
    def tearDownIteration(self, stepIdList):
        self.syncCall(10, self.conn1.operation, "ROLLBACK;")
@@ -1058,7 +1053,6 @@ class ReferentialIntegrityTest(DatabasePermutationTest):
        self.syncCall(10, self.conn1.operation, "INSERT INTO a VALUES (1);", "INSERT 0 1")
        self.syncCall(10, self.conn1.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
        self.syncCall(10, self.conn2.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
-       print stepIdList,
 
    def tearDownIteration(self, stepIdList):
        self.syncCall(10, self.conn1.operation, "ROLLBACK;")
@@ -1121,7 +1115,6 @@ $body$ LANGUAGE PLPGSQL VOLATILE;", "CREATE FUNCTION")
        self.syncCall(10, self.conn1.operation, "INSERT INTO parent VALUES(0);", "INSERT 0 1")
        self.syncCall(10, self.conn1.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
        self.syncCall(10, self.conn2.operation, "BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;", "BEGIN")
-       print stepIdList,
 
    # Override the normal method to allow failures generated by the trigger code
    # to be considered "success".  Just so we can count things up.