summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2012-01-11 18:32:22 +1300
committerRobert Collins <robertc@robertcollins.net>2012-01-11 18:32:22 +1300
commitec629cf047c0f4e1d2d51d30a3d72e5437017936 (patch)
tree303b83687eefca27e8fa2a7eaf9f428acabb87b4 /python
parent8343524a5ee5f459e87bc15c85558a33a867f35a (diff)
downloadsubunit-git-ec629cf047c0f4e1d2d51d30a3d72e5437017936.tar.gz
Handle latest testtools changes.
Diffstat (limited to 'python')
-rw-r--r--python/subunit/tests/test_test_protocol.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py
index c93aabd..019c080 100644
--- 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([