diff options
Diffstat (limited to 'python/subunit')
| -rw-r--r-- | python/subunit/__init__.py | 2 | ||||
| -rw-r--r-- | python/subunit/tests/test_subunit_filter.py | 12 | ||||
| -rw-r--r-- | python/subunit/tests/test_test_protocol.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py index c3d06ff..84426ac 100644 --- a/python/subunit/__init__.py +++ b/python/subunit/__init__.py @@ -363,7 +363,7 @@ class RemotedTestCase(unittest.TestCase): return self.__description def id(self): - return "%s.%s" % (self._strclass(), self.__description) + return "%s" % (self.__description,) def __str__(self): return "%s (%s)" % (self.__description, self._strclass()) diff --git a/python/subunit/tests/test_subunit_filter.py b/python/subunit/tests/test_subunit_filter.py index 825809c..73ec1ed 100644 --- a/python/subunit/tests/test_subunit_filter.py +++ b/python/subunit/tests/test_subunit_filter.py @@ -36,9 +36,9 @@ class TestTestResultFilter(unittest.TestCase): self.filtered_result = unittest.TestResult() self.filter = subunit.TestResultFilter(self.filtered_result) self.run_tests() - self.assertEqual(['subunit.RemotedTestCase.error'], + self.assertEqual(['error'], [error[0].id() for error in self.filtered_result.errors]) - self.assertEqual(['subunit.RemotedTestCase.failed'], + self.assertEqual(['failed'], [failure[0].id() for failure in self.filtered_result.failures]) self.assertEqual(2, self.filtered_result.testsRun) @@ -50,7 +50,7 @@ class TestTestResultFilter(unittest.TestCase): self.run_tests() self.assertEqual([], [error[0].id() for error in self.filtered_result.errors]) - self.assertEqual(['subunit.RemotedTestCase.failed'], + self.assertEqual(['failed'], [failure[0].id() for failure in self.filtered_result.failures]) self.assertEqual(1, self.filtered_result.testsRun) @@ -60,7 +60,7 @@ class TestTestResultFilter(unittest.TestCase): self.filter = subunit.TestResultFilter(self.filtered_result, filter_failure=True) self.run_tests() - self.assertEqual(['subunit.RemotedTestCase.error'], + self.assertEqual(['error'], [error[0].id() for error in self.filtered_result.errors]) self.assertEqual([], [failure[0].id() for failure in @@ -73,9 +73,9 @@ class TestTestResultFilter(unittest.TestCase): self.filter = subunit.TestResultFilter(self.filtered_result, filter_success=False) self.run_tests() - self.assertEqual(['subunit.RemotedTestCase.error'], + self.assertEqual(['error'], [error[0].id() for error in self.filtered_result.errors]) - self.assertEqual(['subunit.RemotedTestCase.failed'], + self.assertEqual(['failed'], [failure[0].id() for failure in self.filtered_result.failures]) self.assertEqual(5, self.filtered_result.testsRun) diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py index 1f9e3a9..73f0821 100644 --- a/python/subunit/tests/test_test_protocol.py +++ b/python/subunit/tests/test_test_protocol.py @@ -772,7 +772,7 @@ class TestRemotedTestCase(unittest.TestCase): self.assertRaises(NotImplementedError, test.tearDown) self.assertEqual("A test description", test.shortDescription()) - self.assertEqual("subunit.RemotedTestCase.A test description", + self.assertEqual("A test description", test.id()) self.assertEqual("A test description (subunit.RemotedTestCase)", "%s" % test) self.assertEqual("<subunit.RemotedTestCase description=" |