summaryrefslogtreecommitdiff
path: root/python/subunit/tests
diff options
context:
space:
mode:
authorJonathan Lange <jml@mumak.net>2006-12-22 17:20:46 +1100
committerJonathan Lange <jml@mumak.net>2006-12-22 17:20:46 +1100
commit0859b36623ee7db9ff6da45625c297488b8d9f35 (patch)
tree7b8ebad2bef819ba14cf2ff83daa2a5ec5e5233f /python/subunit/tests
parenta8c0069d60a01e5ef1a8c37cbb9748364f02b16d (diff)
parentc42cac02dc84b8db42f3c85f36affdaf732245a1 (diff)
downloadsubunit-git-0859b36623ee7db9ff6da45625c297488b8d9f35.tar.gz
- Return a valid exc_info tuple from RemoteError
- Clarify the line-handling logic in the server - Pick out some hacks that were added to allow trial to run the subunit tests
Diffstat (limited to 'python/subunit/tests')
-rw-r--r--python/subunit/tests/test_test_protocol.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py
index eb77e68..a2b054b 100644
--- a/python/subunit/tests/test_test_protocol.py
+++ b/python/subunit/tests/test_test_protocol.py
@@ -138,10 +138,10 @@ class TestTestProtocolServerPipe(unittest.TestCase):
bing = subunit.RemotedTestCase("bing crosby")
an_error = subunit.RemotedTestCase("an error")
self.assertEqual(client.errors,
- [(an_error, 'RemoteError:\n\n\n')])
- self.assertEqual(client.failures,
- [(bing,
- "RemoteError:\nfoo.c:53:ERROR invalid state\n\n")])
+ [(an_error, 'RemoteException: \n\n')])
+ self.assertEqual(
+ client.failures,
+ [(bing, "RemoteException: foo.c:53:ERROR invalid state\n\n")])
self.assertEqual(client.testsRun, 3)
@@ -531,7 +531,7 @@ class TestRemotedTestCase(unittest.TestCase):
"'A test description'>", "%r" % test)
result = unittest.TestResult()
test.run(result)
- self.assertEqual([(test, "RemoteError:\n"
+ self.assertEqual([(test, "RemoteException: "
"Cannot run RemotedTestCases.\n\n")],
result.errors)
self.assertEqual(1, result.testsRun)
@@ -702,7 +702,7 @@ class TestTestProtocolClient(unittest.TestCase):
self.protocol.addFailure(self.test, subunit.RemoteError("boo"))
self.assertEqual(self.io.getvalue(), "failure: Test startTest on a "
"TestProtocolClient. [\n"
- "RemoteError:\n"
+ "RemoteException:\n"
"boo\n"
"]\n")
@@ -711,7 +711,7 @@ class TestTestProtocolClient(unittest.TestCase):
self.protocol.addError(self.test, subunit.RemoteError("phwoar"))
self.assertEqual(self.io.getvalue(), "error: Test startTest on a "
"TestProtocolClient. [\n"
- "RemoteError:\n"
+ "RemoteException:\n"
"phwoar\n"
"]\n")