Change dcheck to use TapReporter rather than default.
authorKevin Grittner <[email protected]>
Fri, 12 Nov 2010 20:28:04 +0000 (14:28 -0600)
committerKevin Grittner <[email protected]>
Fri, 12 Nov 2010 20:28:04 +0000 (14:28 -0600)
Remove extra print statements used to minimize output anomalies
seen when CursesReporter was used.

src/test/regress/pg_dtester.py.in

index a1d0e25acfdf267f7e2576017d2d52bda3106384..2468b4258da6c303b29fcd9e2234c049b69b4946 100644 (file)
@@ -19,7 +19,7 @@ from dtester.events import EventMatcher, EventSource, Event, \
    ProcessOutputEvent, ProcessErrorEvent, ProcessEndedEvent
 from dtester.exceptions import TestAborted, TestFailure
 from dtester.test import TestSuite, BaseTest, SyncTest
-from dtester.reporter import StreamReporter, CursesReporter
+from dtester.reporter import StreamReporter, CursesReporter, TapReporter
 from dtester.runner import Runner, Timeout
 
 # ******  definition of tests and suites  ***********************************
@@ -577,9 +577,6 @@ class PermutationTest(SyncTest):
    def run(self):
        self.populateStepDictionary()
        self.runPermutations(self.stepThreading)
-       # The last two lines of output for the last entry seem to disappear???
-       print
-       print
 
 
 class DummyPermutationTest(PermutationTest):
@@ -669,9 +666,6 @@ class DatabasePermutationTest(PermutationTest):
        self.populateStepDictionary()
        self.runPermutations(self.stepThreading)
        self.printStatistics()
-       # The last two lines of output for the last entry seem to disappear???
-       print
-       print
        if self.rollbackRequiredOK < self.rollbackRequiredCount:
            raise TestFailure("serialization anomalies incorrectly allowed",
                "Database integrity not protected.")
@@ -1617,7 +1611,8 @@ def main(argv):
    }
 
 
-   runner = Runner(testTimeout=600, suiteTimeout=3600)
+   runner = Runner(reporter=TapReporter(sys.stdout, sys.stderr, showTimingInfo=True),
+                   testTimeout=600, suiteTimeout=3600)
    runner.run(tdef, config)