From: Robert Collins <robertc@robertcollins.net>
Date: Sat, 13 Dec 2008 04:36:46 +0000 (+1100)
Subject: Merge tags support.
X-Git-Url: http://git.samba.org/samba.git/?p=third_party%2Fsubunit;a=commitdiff_plain;h=6bd993aaf9d5e9bea1295125f2a503731df5e1c3;hp=0c09f4a34ac3d4f75292306839709bc18762f8ac

Merge tags support.
---

diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index b2b5129..05e4297 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -238,25 +238,25 @@ class TestProtocolClient(unittest.TestResult):
 
     def addError(self, test, error):
         """Report an error in test test."""
-        self._stream.write("error: %s [\n" % test.shortDescription())
-        for line in self._exc_info_to_string(error, test).split():
+        self._stream.write("error: %s [\n" % test.id())
+        for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
 
     def addFailure(self, test, error):
         """Report a failure in test test."""
-        self._stream.write("failure: %s [\n" % test.shortDescription())
-        for line in self._exc_info_to_string(error, test).split():
+        self._stream.write("failure: %s [\n" % test.id())
+        for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
 
     def addSuccess(self, test):
         """Report a success in a test."""
-        self._stream.write("successful: %s\n" % test.shortDescription())
+        self._stream.write("successful: %s\n" % test.id())
 
     def startTest(self, test):
         """Mark a test as starting its test run."""
-        self._stream.write("test: %s\n" % test.shortDescription())
+        self._stream.write("test: %s\n" % test.id())
 
 
 def RemoteError(description=""):
diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py
index 7f5bbe4..52b33c8 100644
--- a/python/subunit/tests/test_test_protocol.py
+++ b/python/subunit/tests/test_test_protocol.py
@@ -747,8 +747,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."""
@@ -758,26 +757,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():