Handle latest testtools changes.

[third_party/subunit] / python / subunit / tests / test_test_protocol.py

diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py
index c93aabd80cdd25e5f9337a99c1ef05306c78c62b..019c080e6dd64148f3351bebffa6ffff936d3b9a 100644 (file)
--- a/python/subunit/tests/test_test_protocol.py
+++ b/python/subunit/tests/test_test_protocol.py
@@ -102,9 +102,9 @@ class TestTestProtocolServerPipe(unittest.TestCase):
                          [(an_error, _remote_exception_str + '\n')])
         self.assertEqual(
             client.failures,
-            [(bing, _remote_exception_str + ": Text attachment: traceback\n"
-                "------------\nfoo.c:53:ERROR invalid state\n"
-                "------------\n\n")])
+            [(bing, _remote_exception_str + 
+                ": foo.c:53:ERROR invalid state\n"
+                "\n")])
         self.assertEqual(client.testsRun, 3)
 
     def test_non_test_characters_forwarded_immediately(self):
@@ -559,9 +559,9 @@ class TestTestProtocolServerAddxFail(unittest.TestCase):
                 value = details
             else:
                 if error_message is not None:
-                    value = subunit.RemoteError(_u("Text attachment: traceback\n"
-                        "------------\n") + _u(error_message) +
-                        _u("------------\n"))
+                    if not len(error_message.strip()):
+                        error_message = _u("Empty attachments:\n  traceback\n")
+                    value = subunit.RemoteError(_u(error_message))
                 else:
                     value = subunit.RemoteError()
             self.assertEqual([