Run test_py3kwarn first to avoid failures with -3.

2 files changed, 7 insertions, 3 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 2177b66e1a..920d545c5d 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -483,6 +483,13 @@ STDTESTS = [
     'test_unittest',
     'test_doctest',
     'test_doctest2',
+    # On 2.6, when a C module like dl or linuxaudiodev is imported by some
+    # test, a DeprecationWarning is raised, but test_py3kwarn can not find
+    # it in the __warningregistry__ of the modules in sys.modules.
+    # C modules raise the warning only once, and since there's no way to
+    # find these warnings, test_py3kwarn is executed first to catch them
+    # before the other modules.  This shouldn't affect 2.7+
+    'test_py3kwarn',
    ]
 
 NOTTESTS = [
diff --git a/Lib/test/test_dl.py b/Lib/test/test_dl.py
index 5c8188e93a..c04bc1b530 100755
--- a/Lib/test/test_dl.py
+++ b/Lib/test/test_dl.py
@@ -3,10 +3,7 @@
    Roger E. Masse  revised strategy by Barry Warsaw
 """
 from test.test_support import verbose,TestSkipped, import_module
-import warnings
-warnings.simplefilter('always')
 dl = import_module('dl', deprecated=True)
-warnings.resetwarnings()
 
 sharedlibs = [
     ('/usr/lib/libc.so', 'getpid'),