From 1d31023b314228a729a480c325bbd5972be69fa0 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 27 May 2008 01:42:29 +0000
Subject: [PATCH] Improvements for test_py3kwarn - Always show warnings so they
 are always catchable - Make test_os_path_walk faster by walking a less
 populous directory

---
 Lib/test/test_py3kwarn.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index d5574f499cd..d023e4b77c6 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -207,9 +207,7 @@ class TestStdlibRemovals(unittest.TestCase):
         for path_mod in ("ntpath", "macpath", "os2emxpath", "posixpath"):
             mod = __import__(path_mod)
             with catch_warning() as w:
-                # Since os3exmpath just imports it from ntpath
-                warnings.simplefilter("always")
-                mod.walk(".", dumbo, None)
+                mod.walk("crashers", dumbo, None)
             self.assertEquals(str(w.message), msg)
 
     def test_commands_members(self):
@@ -223,8 +221,10 @@ class TestStdlibRemovals(unittest.TestCase):
 
 
 def test_main():
-    run_unittest(TestPy3KWarnings,
-                 TestStdlibRemovals)
+    with catch_warning(record=True):
+        warnings.simplefilter("always")
+        run_unittest(TestPy3KWarnings,
+                     TestStdlibRemovals)
 
 if __name__ == '__main__':
     test_main()