Merge lp:~garyvdm/pyjunitxml/consistant_test_ids into lp:pyjunitxml

[Gary van der Merwe]

This fixes Bug #1491635.

I makes the test tests use a implementation of TestCase.id that is consistent across different python versions.

[Gary van der Merwe (garyvdm)]

Sorry. I pushed using git-remote-bzr has not maintained commit ids. I will repush using bzr.

[lp:~garyvdm/pyjunitxml/consistant_test_ids]

28. By Gary van der Merwe on 2016-04-11

For TestJUnitXmlResult use a TestCase.id implementation that is consistant accross different python versions.

[Martin Packman (gz)]

See inline comments.

review: Needs Information

[Robert Collins (lifeless)]

review: Needs Fixing

[Robert Collins (lifeless)]

ping

Unmerged revisions

28. By Gary van der Merwe on 2016-04-11

For TestJUnitXmlResult use a TestCase.id implementation that is consistant accross different python versions.

=== modified file 'junitxml/tests/test_junitxml.py'
--- junitxml/tests/test_junitxml.py	2011-12-07 16:54:18 +0000
+++ junitxml/tests/test_junitxml.py	2016-04-11 12:04:25 +0000
@@ -32,6 +32,14 @@
     def test_with_stream(self):
         result = junitxml.JUnitXmlResult(StringIO())
 
+class ConsistantIdTestCase(unittest.TestCase):
+    """TestCase who's id is consistant accross python 2 & 3.
+    
+    This is to fix https://bugs.launchpad.net/pyjunitxml/+bug/1491635
+    """
+    
+    def id(self):
+        return "%s.%s" % (self.__class__.__name__, self._testMethodName)    
 
 class TestJUnitXmlResult(unittest.TestCase):
 
@@ -109,47 +117,47 @@
         self.assertTrue('Passes" name="test_me(version_1.6)"' in output)
 
     def test_erroring_test(self):
-        class Errors(unittest.TestCase):
+        class Errors(ConsistantIdTestCase):
             def test_me(self):
                 1/0
         self.result.startTestRun()
         Errors("test_me").run(self.result)
         self.result.stopTestRun()
         self.assertEqual("""<testsuite errors="1" failures="0" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.Errors" name="test_me" time="0.000">
+<testcase classname="Errors" name="test_me" time="0.000">
 <error type="ZeroDivisionError">error</error>
 </testcase>
 </testsuite>
 """, self.get_output())
 
     def test_failing_test(self):
-        class Fails(unittest.TestCase):
+        class Fails(ConsistantIdTestCase):
             def test_me(self):
                 self.fail()
         self.result.startTestRun()
         Fails("test_me").run(self.result)
         self.result.stopTestRun()
         self.assertEqual("""<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.Fails" name="test_me" time="0.000">
+<testcase classname="Fails" name="test_me" time="0.000">
 <failure type="AssertionError">failure</failure>
 </testcase>
 </testsuite>
 """, self.get_output())
 
     def test_successful_test(self):
-        class Passes(unittest.TestCase):
+        class Passes(ConsistantIdTestCase):
             def test_me(self):
                 pass
         self.result.startTestRun()
         Passes("test_me").run(self.result)
         self.result.stopTestRun()
         self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.Passes" name="test_me" time="0.000"/>
+<testcase classname="Passes" name="test_me" time="0.000"/>
 </testsuite>
 """, self.get_output())
 
     def test_skip_test(self):
-        class Skips(unittest.TestCase):
+        class Skips(ConsistantIdTestCase):
             def test_me(self):
                 self.skipTest("yo")
         self.result.startTestRun()
@@ -158,7 +166,7 @@
         self.result.stopTestRun()
         output = self.get_output()
         expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.Skips" name="test_me" time="0.000">
+<testcase classname="Skips" name="test_me" time="0.000">
 <skipped>yo</skipped>
 </testcase>
 </testsuite>
@@ -166,7 +174,7 @@
         self.assertEqual(expected, output)
 
     def test_unexpected_success_test(self):
-        class Succeeds(unittest.TestCase):
+        class Succeeds(ConsistantIdTestCase):
             def test_me(self):
                 pass
             try:
@@ -178,13 +186,13 @@
         self.result.stopTestRun()
         output = self.get_output()
         expected = """<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.Succeeds" name="test_me" time="0.000">
+<testcase classname="Succeeds" name="test_me" time="0.000">
 <failure type="unittest.case._UnexpectedSuccess"/>
 </testcase>
 </testsuite>
 """
         expected_old = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.Succeeds" name="test_me" time="0.000"/>
+<testcase classname="Succeeds" name="test_me" time="0.000"/>
 </testsuite>
 """
         if output != expected_old:
@@ -192,7 +200,7 @@
 
     def test_expected_failure_test(self):
         expected_failure_support = [True]
-        class ExpectedFail(unittest.TestCase):
+        class ExpectedFail(ConsistantIdTestCase):
             def test_me(self):
                 self.fail("fail")
             try:
@@ -205,11 +213,11 @@
         self.result.stopTestRun()
         output = self.get_output()
         expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.ExpectedFail" name="test_me" time="0.000"/>
+<testcase classname="ExpectedFail" name="test_me" time="0.000"/>
 </testsuite>
 """
         expected_old = """<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
-<testcase classname="junitxml.tests.test_junitxml.ExpectedFail" name="test_me" time="0.000">
+<testcase classname="ExpectedFail" name="test_me" time="0.000">
 <failure type="AssertionError">failure</failure>
 </testcase>
 </testsuite>