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.
This commit is contained in:
Alvaro Herrera 2013-10-04 10:32:48 -03:00
parent a54141aebc
commit 4f0777ba0f

View file

@ -519,7 +519,11 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
for (i = 0; i < testspec->nsetupsqls; i++) for (i = 0; i < testspec->nsetupsqls; i++)
{ {
res = PQexec(conns[0], testspec->setupsqls[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])); fprintf(stderr, "setup failed: %s", PQerrorMessage(conns[0]));
exit_nicely(); exit_nicely();
@ -648,7 +652,11 @@ teardown:
if (testspec->sessions[i]->teardownsql) if (testspec->sessions[i]->teardownsql)
{ {
res = PQexec(conns[i + 1], 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", fprintf(stderr, "teardown of session %s failed: %s",
testspec->sessions[i]->name, testspec->sessions[i]->name,