(merge 3.2) Issue #12400: regrtest -W doesn't rerun the tests twice anymore,

but captures the output and displays it on failure instead. regrtest -v doesn't
print the error twice anymore if there is only one error.

Lib/test/test_os.py

@@ -40,6 +40,7 @@ class FileTests(unittest.TestCase):
     tearDown = setUp
 
     def test_access(self):
+        self.assertEqual(1,2)
         f = os.open(support.TESTFN, os.O_CREAT|os.O_RDWR)
         os.close(f)
         self.assertTrue(os.access(support.TESTFN, os.W_OK))