diff options
| author | Robert Collins <robertc@robertcollins.net> | 2008-12-15 05:28:06 +1100 |
|---|---|---|
| committer | Robert Collins <robertc@robertcollins.net> | 2008-12-15 05:28:06 +1100 |
| commit | 13d96948acd8537958c2a644ca345a0cd05f1523 (patch) | |
| tree | 9dfd6306b6cf0af31c3e46c5512759e6b064cfc3 /python/subunit/tests/test_test_protocol.py | |
| parent | 4bf57d56ccd503e13abad3ef2b668df077a841de (diff) | |
| parent | 6bd993aaf9d5e9bea1295125f2a503731df5e1c3 (diff) | |
| download | subunit-git-13d96948acd8537958c2a644ca345a0cd05f1523.tar.gz | |
Merge trunk.
Diffstat (limited to 'python/subunit/tests/test_test_protocol.py')
| -rw-r--r-- | python/subunit/tests/test_test_protocol.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py index a041aa0..a84e03e 100644 --- a/python/subunit/tests/test_test_protocol.py +++ b/python/subunit/tests/test_test_protocol.py @@ -935,8 +935,7 @@ class TestTestProtocolClient(unittest.TestCase): def test_start_test(self): """Test startTest on a TestProtocolClient.""" self.protocol.startTest(self.test) - self.assertEqual(self.io.getvalue(), "test: Test startTest on a " - "TestProtocolClient.\n") + self.assertEqual(self.io.getvalue(), "test: %s\n" % self.test.id()) def test_stop_test(self): """Test stopTest on a TestProtocolClient.""" @@ -946,26 +945,26 @@ class TestTestProtocolClient(unittest.TestCase): def test_add_success(self): """Test addSuccess on a TestProtocolClient.""" self.protocol.addSuccess(self.test) - self.assertEqual(self.io.getvalue(), "successful: Test startTest on a " - "TestProtocolClient.\n") + self.assertEqual( + self.io.getvalue(), "successful: %s\n" % self.test.id()) def test_add_failure(self): """Test addFailure on a TestProtocolClient.""" - self.protocol.addFailure(self.test, subunit.RemoteError("boo")) - self.assertEqual(self.io.getvalue(), "failure: Test startTest on a " - "TestProtocolClient. [\n" - "RemoteException:\n" - "boo\n" - "]\n") + self.protocol.addFailure( + self.test, subunit.RemoteError("boo qux")) + self.assertEqual( + self.io.getvalue(), + 'failure: %s [\nRemoteException: boo qux\n]\n' % self.test.id()) def test_add_error(self): """Test stopTest on a TestProtocolClient.""" - self.protocol.addError(self.test, subunit.RemoteError("phwoar")) - self.assertEqual(self.io.getvalue(), "error: Test startTest on a " - "TestProtocolClient. [\n" - "RemoteException:\n" - "phwoar\n" - "]\n") + self.protocol.addError( + self.test, subunit.RemoteError("phwoar crikey")) + self.assertEqual( + self.io.getvalue(), + 'error: %s [\n' + "RemoteException: phwoar crikey\n" + "]\n" % self.test.id()) def test_suite(): |