Rev 5898: (spiv) Stop expecting subunit to get unexpected successes wrong if it has in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5898 [merge]
revision-id: pqm at pqm.ubuntu.com-20110519132257-mssx0kli5k6db7r5
parent: pqm at pqm.ubuntu.com-20110519114413-q8x604ghdurhsjj2
parent: gzlist at googlemail.com-20110518194922-2eeh3p1bhhc682mz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-05-19 13:22:57 +0000
message:
  (spiv) Stop expecting subunit to get unexpected successes wrong if it has
   the recent fix. (Martin [gz])
modified:
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2011-05-16 17:20:43 +0000
+++ b/bzrlib/tests/test_selftest.py	2011-05-18 19:49:22 +0000
@@ -2195,9 +2195,13 @@
         content, result = self.run_subunit_stream('test_unexpected_success')
         self.assertContainsRe(content, '(?m)^log$')
         self.assertContainsRe(content, 'test with unexpected success')
-        self.expectFailure('subunit treats "unexpectedSuccess"'
-                           ' as a plain success',
-            self.assertEqual, 1, len(result.unexpectedSuccesses))
+        # GZ 2011-05-18: Old versions of subunit treat unexpected success as a
+        #                success, if a min version check is added remove this
+        from subunit import TestProtocolClient as _Client
+        if _Client.addUnexpectedSuccess.im_func is _Client.addSuccess.im_func:
+            self.expectFailure('subunit treats "unexpectedSuccess"'
+                               ' as a plain success',
+                self.assertEqual, 1, len(result.unexpectedSuccesses))
         self.assertEqual(1, len(result.unexpectedSuccesses))
         test = result.unexpectedSuccesses[0]
         # RemotedTestCase doesn't preserve the "details"