bpo-33746: Fix test_unittest.testRegisterResult() in verbose mode (GH-7799)

miss-islington · vstinner · web-flow · commit 2b7574213987 · 2018-06-20T02:54:32.000-07:00
Only make sure that the result is in unittest.signals._results, don't check the full content of unittest.signals._results. support._run_suite() uses TextTestRunner in verbose mode, but TextTestRunner.run() calls registerResult(result) which made the test fail with "odd object in result set". Call also removeResult() to restore unittest.signals._results to avoid test side effect. (cherry picked from commit fd8fbce) Co-authored-by: Victor Stinner <vstinner@redhat.com>
diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py
@@ -41,16 +41,13 @@ def testInstallHandler(self):
 
     def testRegisterResult(self):
         result = unittest.TestResult()
-        unittest.registerResult(result)
-
-        for ref in unittest.signals._results:
-            if ref is result:
-                break
-            elif ref is not result:
-                self.fail("odd object in result set")
-        else:
-            self.fail("result not found")
+        self.assertNotIn(result, unittest.signals._results)
 
+        unittest.registerResult(result)
+        try:
+            self.assertIn(result, unittest.signals._results)
+        finally:
+            unittest.removeResult(result)
 
     def testInterruptCaught(self):
         default_handler = signal.getsignal(signal.SIGINT)
diff --git a/Misc/NEWS.d/next/Tests/2018-06-19-17-55-46.bpo-33746.Sz7avn.rst b/Misc/NEWS.d/next/Tests/2018-06-19-17-55-46.bpo-33746.Sz7avn.rst
@@ -0,0 +1 @@
+Fix test_unittest when run in verbose mode.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix test_unittest when run in verbose mode.`