From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Fri, 4 Oct 2013 13:32:48 +0000 (-0300)
Subject: isolationtester: Allow tuples to be returned in more places
X-Git-Tag: REL9_3_1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb8a811c5a0d91f53995f0d21ca88adf4eb6d1be;p=postgresql

isolationtester: Allow tuples to be returned in more places

Previously, isolationtester would forbid returning tuples in
session-specific teardown (but not global teardown), as well as in
global setup.  Allow these places to return tuples, too.
---

diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index f2807799d6..f62565046c 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -519,7 +519,11 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 	for (i = 0; i < testspec->nsetupsqls; i++)
 	{
 		res = PQexec(conns[0], testspec->setupsqls[i]);
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
+		if (PQresultStatus(res) == PGRES_TUPLES_OK)
+		{
+			printResultSet(res);
+		}
+		else if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		{
 			fprintf(stderr, "setup failed: %s", PQerrorMessage(conns[0]));
 			exit_nicely();
@@ -648,7 +652,11 @@ teardown:
 		if (testspec->sessions[i]->teardownsql)
 		{
 			res = PQexec(conns[i + 1], testspec->sessions[i]->teardownsql);
-			if (PQresultStatus(res) != PGRES_COMMAND_OK)
+			if (PQresultStatus(res) == PGRES_TUPLES_OK)
+			{
+				printResultSet(res);
+			}
+			else if (PQresultStatus(res) != PGRES_COMMAND_OK)
 			{
 				fprintf(stderr, "teardown of session %s failed: %s",
 						testspec->sessions[i]->name,