← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_selftest.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-20 08:37:32 UTC
  • mfrom: (4299 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4300.
  • Revision ID: tanner@real-time.com-20090420083732-bzx919oo7wpmqc2u
[merge] 1.14rc2 back into bzr.dev (Bob Tanner)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_selftest.py
102
102
        test = ProtocolTestCase(stream)
103
103
        result = unittest.TestResult()
104
104
        test.run(result)
105
 
        # 1 to deal with the 'test:' noise at the start, and 1 for the one we
106
 
        # ran.
107
 
        self.assertEqual(2, result.testsRun)
 
105
        self.assertEqual(1, result.testsRun)
108
106
 
109
107
 
110
108
class TestRunBzr(ExternalBase):
198
196
        finally:
199
197
            TestCaseWithMemoryTransport.TEST_ROOT = old_root
200
198
        self.assertContainsRe(out, 'Ran 0 tests.*\n\nOK')
201
 
        self.assertEqual(
202
 
            'tests passed\n',
203
 
            err)
 
199
        self.assertContainsRe(out, 'tests passed\n')
204
200
        benchfile = open(".perf_history", "rt")
205
201
        try:
206
202
            lines = benchfile.readlines()