Merged revisions 62792,62799-62800 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62792 | brett.cannon | 2008-05-07 01:22:02 +0200 (Wed, 07 May 2008) | 2 lines

  When testing a module's __all__, we really don't care if it is deprecated.
........
  r62799 | christian.heimes | 2008-05-07 01:42:58 +0200 (Wed, 07 May 2008) | 1 line

  Disabled some unit tests for the upcoming release. See #2777
........
  r62800 | brett.cannon | 2008-05-07 01:44:04 +0200 (Wed, 07 May 2008) | 2 lines

  Create a TextMate directory in Misc to house a Python-Dev bundle.
........

2 files changed, 16 insertions, 13 deletions

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index a2a2519..d88c400 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -1,18 +1,21 @@
 import unittest
-from test.test_support import run_unittest
+from test.test_support import run_unittest, catch_warning
 import sys
+import warnings
 
 
 class AllTest(unittest.TestCase):
 
     def check_all(self, modname):
         names = {}
-        try:
-            exec("import %s" % modname, names)
-        except ImportError:
-            # Silent fail here seems the best route since some modules
-            # may not be available in all environments.
-            return
+        with catch_warning():
+            warnings.filterwarnings("ignore", ".* module", DeprecationWarning)
+            try:
+                exec("import %s" % modname, names)
+            except ImportError:
+                # Silent fail here seems the best route since some modules
+                # may not be available in all environments.
+                return
         self.failUnless(hasattr(sys.modules[modname], "__all__"),
                         "%s has no __all__ attribute" % modname)
         names = {}
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 98a9e44..3d6777f 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -584,7 +584,7 @@ class ProcessTestCase(unittest.TestCase):
             os.remove(fname)
             self.assertEqual(rc, 47)
 
-        def test_send_signal(self):
+        def DISABLED_test_send_signal(self):
             p = subprocess.Popen([sys.executable,
                               "-c", "input()"])
 
@@ -592,7 +592,7 @@ class ProcessTestCase(unittest.TestCase):
             p.send_signal(signal.SIGINT)
             self.assertNotEqual(p.wait(), 0)
 
-        def test_kill(self):
+        def DISABLED_test_kill(self):
             p = subprocess.Popen([sys.executable,
                             "-c", "input()"])
 
@@ -600,7 +600,7 @@ class ProcessTestCase(unittest.TestCase):
             p.kill()
             self.assertEqual(p.wait(), -signal.SIGKILL)
 
-        def test_terminate(self):
+        def DISABLED_test_terminate(self):
             p = subprocess.Popen([sys.executable,
                             "-c", "input()"])
 
@@ -678,7 +678,7 @@ class ProcessTestCase(unittest.TestCase):
                                  ' -c "import sys; sys.exit(47)"')
             self.assertEqual(rc, 47)
 
-        def test_send_signal(self):
+        def DISABLED_test_send_signal(self):
             p = subprocess.Popen([sys.executable,
                               "-c", "input()"])
 
@@ -686,7 +686,7 @@ class ProcessTestCase(unittest.TestCase):
             p.send_signal(signal.SIGTERM)
             self.assertNotEqual(p.wait(), 0)
 
-        def test_kill(self):
+        def DISABLED_test_kill(self):
             p = subprocess.Popen([sys.executable,
                             "-c", "input()"])
 
@@ -694,7 +694,7 @@ class ProcessTestCase(unittest.TestCase):
             p.kill()
             self.assertNotEqual(p.wait(), 0)
 
-        def test_terminate(self):
+        def DISABLED_test_terminate(self):
             p = subprocess.Popen([sys.executable,
                             "-c", "input()"])