properly include expected failures & unexpected successes in output

Author: danchr

tests/testsuite.py

@@ -632,7 +632,6 @@ def test_xmlrunner_hold_traceback(self):
         countAfterTest = sys.getrefcount(self.DummyRefCountTest.dummy)
         self.assertEqual(countBeforeTest, countAfterTest)
 
-<<<<<<< HEAD
     class StderrXMLTestRunner(xmlrunner.XMLTestRunner):
         """
         XMLTestRunner that outputs to sys.stderr that might be replaced
@@ -706,8 +705,6 @@ def test_test_program_fail_wo_buffer(self):
         self.assertIn('should be printed', r[0].getvalue())
         self.assertNotIn('should be printed', r[1].getvalue())
 
-=======
->>>>>>> d6e413c... Improve coverages for _DuplicateWriter
 
 class DuplicateWriterTestCase(unittest.TestCase):
     def setUp(self):
@@ -752,7 +749,6 @@ def test_write(self):
         self.writer.flush()
         self.assertEqual(self.getFirstContent(), self.getSecondContent())
         self.assertEqual(wrote, len(self.getSecondContent()))
-<<<<<<< HEAD
 
 
 @unittest.skipIf(sys.version_info[0] < 3, 'Python 3 required')
@@ -777,5 +773,3 @@ def test_xmlrunner_output(self, exiter, testrunner):
         testrunner.assert_called_once_with(**kwargs)
 
         exiter.assert_called_once_with(False)
-=======
->>>>>>> d6e413c... Improve coverages for _DuplicateWriter

xmlrunner/result.py

@@ -429,7 +429,7 @@ def _get_info_by_testcase(self):
         tests_by_testcase = {}
 
         for tests in (self.successes, self.failures, self.errors,
-                      self.skipped):
+                      self.skipped, self.expectedFailures, self.unexpectedSuccesses):
             for test_info in tests:
                 if isinstance(test_info, tuple):
                     # This is a skipped, error or a failure test case