From 0226d857377abf6826571b618d05ae94d5f9a6b0 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Thu, 30 Aug 2007 12:32:23 +0000 Subject: [PATCH] * Skip test_pipes on non-POSIX. * Don't raise TestSkipped within a test function. --- Lib/test/test_pipes.py | 5 ++++- Lib/test/test_winreg.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_pipes.py b/Lib/test/test_pipes.py index 70d1ec2b946..a440ac1c92d 100644 --- a/Lib/test/test_pipes.py +++ b/Lib/test/test_pipes.py @@ -2,7 +2,10 @@ import pipes import os import string import unittest -from test.test_support import TESTFN, run_unittest, unlink +from test.test_support import TESTFN, run_unittest, unlink, TestSkipped + +if os.name != 'posix': + raise TestSkipped('pipes module only works on posix') TESTFN2 = TESTFN + "2" diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py index ce8f85ae1cf..85a0aacb95d 100644 --- a/Lib/test/test_winreg.py +++ b/Lib/test/test_winreg.py @@ -157,8 +157,7 @@ class WinregTests(unittest.TestCase): def testRemoteMachineRegistryWorks(self): if not self.remote_name: - raise test_support.TestSkipped("Remote machine name " - "not specified.") + return # remote machine name not specified remote_key = ConnectRegistry(self.remote_name, HKEY_CURRENT_USER) self.TestAll(remote_key)