Merge lp:~xnox/subunit/hash-ordering into lp:~subunit/subunit/trunk

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

This was not enough to build in Raring.

review: Needs Fixing

[lp:~xnox/subunit/hash-ordering]

177. By Dimitri John Ledkov on 2012-10-30

Use or expect ordered results, fixes FTBFS with python3.3's order randomisation.

Unmerged revisions

177. By Dimitri John Ledkov on 2012-10-30

Use or expect ordered results, fixes FTBFS with python3.3's order randomisation.

=== modified file 'python/subunit/__init__.py'
--- python/subunit/__init__.py	2012-05-07 22:19:16 +0000
+++ python/subunit/__init__.py	2012-10-30 23:03:21 +0000
@@ -772,7 +772,7 @@
             return
         tags = set([tag.encode('utf8') for tag in new_tags])
         tags.update([_b("-") + tag.encode('utf8') for tag in gone_tags])
-        tag_line = _b("tags: ") + _b(" ").join(tags) + _b("\n")
+        tag_line = _b("tags: ") + _b(" ").join(sorted(tags)) + _b("\n")
         self._stream.write(tag_line)
 
     def time(self, a_datetime):
@@ -798,7 +798,7 @@
             if parameters:
                 self._stream.write(_b(";"))
                 param_strs = []
-                for param, value in parameters.items():
+                for param, value in sorted(parameters.items()):
                     param_strs.append("%s=%s" % (param, value))
                 self._stream.write(_b(",".join(param_strs)))
             self._stream.write(_b("\n%s\n" % name))

=== modified file 'python/subunit/tests/test_test_protocol.py'
--- python/subunit/tests/test_test_protocol.py	2012-03-25 14:38:54 +0000
+++ python/subunit/tests/test_test_protocol.py	2012-10-30 23:03:21 +0000
@@ -14,6 +14,7 @@
 #  limitations under that license.
 #
 
+from collections import OrderedDict
 import datetime
 import unittest
 import os
@@ -1134,9 +1135,10 @@
         self.io = BytesIO()
         self.protocol = subunit.TestProtocolClient(self.io)
         self.test = TestTestProtocolClient("test_start_test")
-        self.sample_details = {'something':Content(
-            ContentType('text', 'plain'), lambda:[_b('serialised\nform')])}
-        self.sample_tb_details = dict(self.sample_details)
+        self.sample_details = OrderedDict([
+            ('something', Content(ContentType('text', 'plain'),
+                                  lambda:[_b('serialised\nform')]))])
+        self.sample_tb_details = OrderedDict(self.sample_details)
         self.sample_tb_details['traceback'] = TracebackContent(
             subunit.RemoteError(_u("boo qux")), self.test)
 
@@ -1311,7 +1313,7 @@
 
     def test_tags_both(self):
         self.protocol.tags(set(['quux']), set(['bar']))
-        self.assertEqual(_b("tags: quux -bar\n"), self.io.getvalue())
+        self.assertEqual(_b("tags: -bar quux\n"), self.io.getvalue())
 
     def test_tags_gone(self):
         self.protocol.tags(set(), set(['bar']))