Skip to content

Commit c67ad6e

Browse files
ikedamdnozay
authored andcommitted
Improve coverages for _DuplicateWriter
1 parent 896c5a2 commit c67ad6e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

tests/testsuite.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,7 @@ def test_xmlrunner_hold_traceback(self):
632632
countAfterTest = sys.getrefcount(self.DummyRefCountTest.dummy)
633633
self.assertEqual(countBeforeTest, countAfterTest)
634634

635+
<<<<<<< HEAD
635636
class StderrXMLTestRunner(xmlrunner.XMLTestRunner):
636637
"""
637638
XMLTestRunner that outputs to sys.stderr that might be replaced
@@ -705,6 +706,8 @@ def test_test_program_fail_wo_buffer(self):
705706
self.assertIn('should be printed', r[0].getvalue())
706707
self.assertNotIn('should be printed', r[1].getvalue())
707708

709+
=======
710+
>>>>>>> d6e413c... Improve coverages for _DuplicateWriter
708711

709712
class DuplicateWriterTestCase(unittest.TestCase):
710713
def setUp(self):
@@ -749,6 +752,7 @@ def test_write(self):
749752
self.writer.flush()
750753
self.assertEqual(self.getFirstContent(), self.getSecondContent())
751754
self.assertEqual(wrote, len(self.getSecondContent()))
755+
<<<<<<< HEAD
752756

753757

754758
@unittest.skipIf(sys.version_info[0] < 3, 'Python 3 required')
@@ -773,3 +777,5 @@ def test_xmlrunner_output(self, exiter, testrunner):
773777
testrunner.assert_called_once_with(**kwargs)
774778

775779
exiter.assert_called_once_with(False)
780+
=======
781+
>>>>>>> d6e413c... Improve coverages for _DuplicateWriter

0 commit comments

Comments
 (0)