/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/test_selftest.py

  • Committer: Martin
  • Date: 2011-05-18 19:49:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5898.
  • Revision ID: gzlist@googlemail.com-20110518194922-2eeh3p1bhhc682mz
Stop expecting subunit to get unexpected successes wrong if it has the recent fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
2195
2195
        content, result = self.run_subunit_stream('test_unexpected_success')
2196
2196
        self.assertContainsRe(content, '(?m)^log$')
2197
2197
        self.assertContainsRe(content, 'test with unexpected success')
2198
 
        self.expectFailure('subunit treats "unexpectedSuccess"'
2199
 
                           ' as a plain success',
2200
 
            self.assertEqual, 1, len(result.unexpectedSuccesses))
 
2198
        # GZ 2011-05-18: Old versions of subunit treat unexpected success as a
 
2199
        #                success, if a min version check is added remove this
 
2200
        from subunit import TestProtocolClient as _Client
 
2201
        if _Client.addUnexpectedSuccess.im_func is _Client.addSuccess.im_func:
 
2202
            self.expectFailure('subunit treats "unexpectedSuccess"'
 
2203
                               ' as a plain success',
 
2204
                self.assertEqual, 1, len(result.unexpectedSuccesses))
2201
2205
        self.assertEqual(1, len(result.unexpectedSuccesses))
2202
2206
        test = result.unexpectedSuccesses[0]
2203
2207
        # RemotedTestCase doesn't preserve the "details"