From 840ac926c572caa7656449aa1e815660e69f7713 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Tue, 31 Mar 2009 23:45:39 +0000 Subject: [PATCH] Fix Windows test skip error revealed by buildbot. Also a comment spelling correction in a previously fixed test. --- Lib/test/test_sqlite.py | 2 +- Lib/test/test_wait4.py | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py index f8b2f9816b9..167408cd3db 100644 --- a/Lib/test/test_sqlite.py +++ b/Lib/test/test_sqlite.py @@ -1,7 +1,7 @@ import unittest from test.test_support import run_unittest, import_module -#Skip test of _sqlite3 module not installed +# Skip test if _sqlite3 module was not built. import_module('_sqlite3') from sqlite3.test import (dbapi, types, userfunctions, py25tests, diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py index 60b89e8439a..d04a11bde10 100644 --- 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.test_support import run_unittest, reap_children +from test.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):