Merged revisions 70930 via svnmerge from

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

........
  r70930 | r.david.murray | 2009-03-31 19:45:39 -0400 (Tue, 31 Mar 2009) | 3 lines

  Fix Windows test skip error revealed by buildbot.  Also a comment spelling
  correction in a previously fixed test.
........

diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py
index 8c6e4a317fa14b8ab9b9ba3150b06ecf2235a00e..cdcd0604b7ceaba068aad599d114c05b72b46a26 100644 (file)
--- a/Lib/test/test_wait4.py
+++ b/Lib/test/test_wait4.py
@@ -4,17 +4,12 @@
 import os
 import time
 from test.fork_wait import ForkWait
-from test.support import run_unittest, reap_children
+from test.support import run_unittest, reap_children, get_attribute
 
-try:
-    os.fork
-except AttributeError:
-    raise unittest.SkipTest("os.fork not defined -- skipping test_wait4")
+# If either of these do not exist, skip this test.
+get_attribute(os, 'fork')
+get_attribute(os, 'wait4')
 
-try:
-    os.wait4
-except AttributeError:
-    raise unittest.SkipTest("os.wait4 not defined -- skipping test_wait4")
 
 class Wait4Test(ForkWait):
     def wait_impl(self, cpid):