* Skip test_pipes on non-POSIX.
* Don't raise TestSkipped within a test function.
diff --git a/Lib/test/test_pipes.py b/Lib/test/test_pipes.py
index 70d1ec2..a440ac1 100644
--- a/Lib/test/test_pipes.py
+++ b/Lib/test/test_pipes.py
@@ -2,7 +2,10 @@
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 ce8f85a..85a0aac 100644
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -157,8 +157,7 @@
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)