From: Kevin Grittner <Kevin.Grittner@wicourts.gov>
Date: Mon, 15 Nov 2010 21:32:13 +0000 (-0600)
Subject: Fix bug in pg_dtester.py.in under dtester 0.2.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=1b2a15aff7766a4c2f9dbd352077e69d2f84f9b3;p=users%2Fkgrittn%2Fpostgres.git

Fix bug in pg_dtester.py.in under dtester 0.2.
We need to 'current transaction is aborted' errors within
DatabasePermutationTest to allow all permutations to run and to
not generate false failures.
---

diff --git a/src/test/regress/pg_dtester.py.in b/src/test/regress/pg_dtester.py.in
index 8dba68631d..f9a3f191dd 100644
--- a/src/test/regress/pg_dtester.py.in
+++ b/src/test/regress/pg_dtester.py.in
@@ -654,7 +654,9 @@ class DatabasePermutationTest(PermutationTest):
 			if len(line) > 0 and line.startswith("ERROR:  could not serialize"):
 				self.serializationFailure = True
 			else:
-				if len(line) > 0 and line.startswith("ERROR:"):
+				if (len(line) > 0
+					and line.startswith("ERROR:")
+					and not line.startswith("ERROR:  current transaction is aborted")):
 					raise TestFailure("failure other than serializable encountered: " + line, line)
 
 	def printStatistics(self):