From: Brian Warner <warner@allmydata.com>
Date: Tue, 18 Sep 2007 04:56:08 +0000 (-0700)
Subject: test_runner.py: skip the start/stop test when sys.platform is win32/cygwin.
X-Git-Tag: allmydata-tahoe-0.6.0~79
X-Git-Url: https://git.rkrishnan.org/simplejson//%22news.html/%22?a=commitdiff_plain;h=645927ca730f77bcc4fc2f61ab2e0062d0c3df88;p=tahoe-lafs%2Ftahoe-lafs.git

test_runner.py: skip the start/stop test when sys.platform is win32/cygwin.
The previous twisted.python.runtime.platformType approach didn't catch cygwin
for some reason.
---

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 8696e8c6..3e7c88bf 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -1,11 +1,10 @@
 
 from twisted.trial import unittest
-from twisted.python.runtime import platformType
 
 import time
 from cStringIO import StringIO
 from twisted.python import usage
-import os.path
+import sys, os.path
 from allmydata.scripts import runner, debug
 from allmydata.util import fileutil
 
@@ -107,7 +106,9 @@ class RunNode(unittest.TestCase):
         return basedir
 
     def test_client(self):
-        if platformType == "win32":
+        if sys.platform in ("win32", "cygwin"):
+            # thus might not be entirely true, but I've yet to see proper
+            # daemonization on a windows box. -warner
             raise unittest.SkipTest("twistd does not fork under windows")
         basedir = self.workdir("test_client")
         c1 = os.path.join(basedir, "c1")