From: schlamar <marc.schlaich@gmail.com>
Date: Tue, 6 May 2014 09:35:51 +0000 (+0200)
Subject: Fixed tests on Windows.
X-Git-Tag: v4.0.0b1~83^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1045%2Fhead;p=thirdparty%2Ftornado.git

Fixed tests on Windows.
---

diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
index 3060c6c2c..e187cc181 100644
--- a/tornado/test/ioloop_test.py
+++ b/tornado/test/ioloop_test.py
@@ -219,7 +219,7 @@ class TestIOLoop(AsyncTestCase):
             client_sock.connect(('127.0.0.1', port))
             self.wait()
         self.assertIs(fds[0], server_sock)
-        self.assertIs(fds[1], server_sock.fileno())
+        self.assertEqual(fds[1], server_sock.fileno())
         self.io_loop.remove_handler(server_sock.fileno())
         server_sock.close()
 
diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
index e6f085ebd..0f18b3305 100644
--- a/tornado/test/netutil_test.py
+++ b/tornado/test/netutil_test.py
@@ -96,6 +96,7 @@ class ThreadedResolverTest(AsyncTestCase, _ResolverTestMixin):
 
 @skipIfNoNetwork
 @unittest.skipIf(futures is None, "futures module not present")
+@unittest.skipIf(sys.platform == 'win32', "preexec_fn not available on win32")
 class ThreadedResolverImportTest(unittest.TestCase):
     def test_import(self):
         TIMEOUT = 5