[Python-checkins] r70932 - in python/branches/py3k: Lib/test/test_wait4.py

[r.david.murray]

Author: r.david.murray
Date: Wed Apr  1 01:50:31 2009
New Revision: 70932

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_wait4.py

Modified: python/branches/py3k/Lib/test/test_wait4.py
==============================================================================
--- python/branches/py3k/Lib/test/test_wait4.py	(original)
+++ python/branches/py3k/Lib/test/test_wait4.py	Wed Apr  1 01:50:31 2009
@@ -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):