diff options
| author | Alvaro Herrera | 2013-10-04 13:32:48 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2013-10-04 17:54:55 +0000 |
| commit | 4f0777ba0fcfc8274b69f39de10f8d905b9f89ba (patch) | |
| tree | ed2060cfe7a418fc1d407fe957b2a6b5899fbfca | |
| parent | a54141aebcafa02cba5204596758dadbbeb0f78e (diff) | |
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.
| -rw-r--r-- | src/test/isolation/isolationtester.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index f2807799d6e..f62565046c3 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, |