summaryrefslogtreecommitdiff
path: root/python/subunit/tests/test_test_protocol.py
diff options
context:
space:
mode:
authorJonathan Lange <jml@canonical.com>2012-02-16 09:59:12 +0000
committerJonathan Lange <jml@canonical.com>2012-02-16 09:59:12 +0000
commite77a63032cfec4f142e15cb8fb72c5ad718cfde6 (patch)
tree79edf7cc702105e16e5b527ebfcef23b5c069727 /python/subunit/tests/test_test_protocol.py
parent0882a75f5e3e9adacfece2345afac8570eb7ebd9 (diff)
downloadsubunit-git-e77a63032cfec4f142e15cb8fb72c5ad718cfde6.tar.gz
Make sure the tests pass with 0.9.11 as well as 0.9.12 & 13
Diffstat (limited to 'python/subunit/tests/test_test_protocol.py')
-rw-r--r--python/subunit/tests/test_test_protocol.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py
index 60f05b3..ec6830d 100644
--- a/python/subunit/tests/test_test_protocol.py
+++ b/python/subunit/tests/test_test_protocol.py
@@ -107,9 +107,8 @@ class TestTestProtocolServerPipe(unittest.TestCase):
[(an_error, _remote_exception_str + '\n')])
self.assertEqual(
client.failures,
- [(bing, _remote_exception_str +
- ": foo.c:53:ERROR invalid state\n"
- "\n")])
+ [(bing, _remote_exception_str + ": "
+ + details_to_str({'traceback': text_content(traceback)}) + "\n")])
self.assertEqual(client.testsRun, 3)
def test_non_test_characters_forwarded_immediately(self):
@@ -564,9 +563,7 @@ class TestTestProtocolServerAddxFail(unittest.TestCase):
value = details
else:
if error_message is not None:
- if not len(error_message.strip()):
- error_message = _u("Empty attachments:\n traceback\n")
- value = subunit.RemoteError(_u(error_message))
+ value = subunit.RemoteError(details_to_str(details))
else:
value = subunit.RemoteError()
self.assertEqual([