/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Robert Collins
  • Date: 2009-08-26 22:47:18 UTC
  • mto: This revision was merged to the branch mainline in revision 4659.
  • Revision ID: robertc@robertcollins.net-20090826224718-xjqbmhs14m7lmnjg
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
175
175
        self._overall_start_time = time.time()
176
176
        self._strict = strict
177
177
 
178
 
    def done(self):
179
 
        # nb: called stopTestRun in the version of this that Python merged
180
 
        # upstream, according to lifeless 20090803
 
178
    def stopTestRun(self):
181
179
        if self._strict:
182
180
            ok = self.wasStrictlySuccessful()
183
181
        else:
421
419
        self.pb.update_latency = 0
422
420
        self.pb.show_transport_activity = False
423
421
 
424
 
    def done(self):
 
422
    def stopTestRun(self):
425
423
        # called when the tests that are going to run have run
426
424
        self.pb.clear()
427
 
        super(TextTestResult, self).done()
 
425
        super(TextTestResult, self).stopTestRun()
428
426
 
429
427
    def finished(self):
430
428
        self.pb.finished()
2833
2831
    result = runner.run(suite)
2834
2832
    if list_only:
2835
2833
        return True
2836
 
    result.done()
 
2834
    result.stopTestRun()
2837
2835
    if strict:
2838
2836
        return result.wasStrictlySuccessful()
2839
2837
    else:
3168
3166
    def stopTest(self, test):
3169
3167
        self.result.stopTest(test)
3170
3168
 
 
3169
    def startTestRun(self):
 
3170
        self.result.startTestRun()
 
3171
 
 
3172
    def stopTestRun(self):
 
3173
        self.result.stopTest()
 
3174
 
3171
3175
    def addSkip(self, test, reason):
3172
3176
        self.result.addSkip(test, reason)
3173
3177