Make test_warnings play nice with regrtest -R:: now that regrtest doesn't
always reload the module (specifically, it doesn't reload if the module has
a 'test_main'.)
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index 5a3f521..5d051a5 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -82,11 +82,11 @@
self.assertEqual(msg.category, 'UserWarning')
def test_main(verbose=None):
+ # Obscure hack so that this test passes after reloads or repeated calls
+ # to test_main (regrtest -R).
+ if '__warningregistry__' in globals():
+ del globals()['__warningregistry__']
test_support.run_unittest(TestModule)
-# Obscure hack so that this test passes after reloads (regrtest -R).
-if '__warningregistry__' in globals():
- del globals()['__warningregistry__']
-
if __name__ == "__main__":
test_main(verbose=True)