* TestTestProtocols' test_tags_both was set sort order dependent.

  (Robert Collins, #1025392)

diff --git a/NEWS b/NEWS
index fbbf4b4adf0d07509b6c5dc7205a322bf78f0021..f505bb3457bac2370a4bc3fc034c893a61e73144 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ BUG FIXES
 * TestProtocol2's tag tests were set sort order dependent.
   (Robert Collins, #1025392)
 
+* TestTestProtocols' test_tags_both was set sort order dependent.
+  (Robert Collins, #1025392)
+
 0.0.13
 ------
 

diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py
index dc2c31825f08a4ab29ac5ddaa1b43fe1336442c8..9bdf3888d1534f090ea0d510381edff09ac5fa13 100644 (file)
--- a/python/subunit/tests/test_test_protocol.py
+++ b/python/subunit/tests/test_test_protocol.py
@@ -34,6 +34,7 @@ except ImportError:
         Python27TestResult,
         ExtendedTestResult,
         )
+from testtools.matchers import Contains
 
 import subunit
 from subunit import _remote_exception_str, _remote_exception_str_chunked
@@ -1128,9 +1129,10 @@ class TestIsolatedTestSuite(TestCase):
         self.assertEqual(self.SampleTestToIsolate.TEST, False)
 
 
-class TestTestProtocolClient(unittest.TestCase):
+class TestTestProtocolClient(TestCase):
 
     def setUp(self):
+        super(TestTestProtocolClient, self).setUp()
         self.io = BytesIO()
         self.protocol = subunit.TestProtocolClient(self.io)
         self.unicode_test = PlaceHolder(_u('\u2603'))
@@ -1324,7 +1326,9 @@ class TestTestProtocolClient(unittest.TestCase):
 
     def test_tags_both(self):
         self.protocol.tags(set(['quux']), set(['bar']))
-        self.assertEqual(_b("tags: quux -bar\n"), self.io.getvalue())
+        self.assertThat(
+            [b"tags: quux -bar\n", b"tags: -bar quux\n"],
+            Contains(self.io.getvalue()))
 
     def test_tags_gone(self):
         self.protocol.tags(set(), set(['bar']))