From: Gregory P. Smith <greg@mad-scientist.com>
Date: Mon, 1 Mar 2010 06:03:44 +0000 (+0000)
Subject: Merged revisions 78550 via svnmerge from
X-Git-Tag: v2.6.5rc1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e064bd1ab12e7d98d603b3a2ea66af25e329ea4;p=python

Merged revisions 78550 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78550 | gregory.p.smith | 2010-02-28 22:01:02 -0800 (Sun, 28 Feb 2010) | 2 lines

  Fix test to be skipped on windows.
........
---

diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 8dd8d1e897..09ce6b6760 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -174,11 +174,7 @@ class TestForkInThread(unittest.TestCase):
     def setUp(self):
         self.read_fd, self.write_fd = os.pipe()
 
-    def test_forkinthread(self):
-        if sys.platform.startswith('win'):
-            from test.test_support import TestSkipped
-            raise TestSkipped("This test is only appropriate for "
-                              "POSIX-like systems.")
+    def _test_forkinthread(self):
         def thread1():
             try:
                 pid = os.fork() # fork in a thread
@@ -196,6 +192,9 @@ class TestForkInThread(unittest.TestCase):
         self.assertEqual(os.read(self.read_fd, 2), "OK",
                          "Unable to fork() in thread")
 
+    if sys.platform.startswith('win'):
+        test_forkinthread = _test_forkinthread
+
     def tearDown(self):
         try:
             os.close(self.read_fd)