Merge lp:~gz/bzr/trivial_subunit_unexpectedly_correct into lp:bzr

[Martin Packman]

Stop expecting subunit to get unexpected successes wrong if it has the recent fix.

Per bug 654474 subunit used to treat unexpected successes as successes rather than failures, and when John wrote some tests for logs being kept or discarded in subunit streams, he had to add an expectFailure for this case. Now that it's fixed in subunit (but not in a released version), that check unexpectedly passes with a trunk subunit. And as Bazaar now treats unexpected successes as failures too...

There doesn't seem to be a neat way of checking the subunit version, and we don't require a minimum subunit version for `bzr selftest` so this pokes around the subunit module to see if the new implementation is in place before running the check.

[Vincent Ladeuil (vila)]

Hmm, should we file a bug to make sure we remove that once we require a released version of subunit with the fix ?

Half-serious.

review: Approve

[Martin Packman (gz)]

Bug 531667 exists for having a version attribute in the subunit python module that we'd need in order to require a minimum subunit version.

[Vincent Ladeuil (vila)]

> Bug 531667 exists for having a version attribute in the subunit python module
> that we'd need in order to require a minimum subunit version.

Hehe, isn't it lovely when pieces naturally fell in the right place ;)

Should I upgrade my vote to tweak so you mention the bug # in the comment ? ;)

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2011-05-16 17:20:43 +0000
+++ bzrlib/tests/test_selftest.py	2011-05-18 19:58:29 +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"