Fixed tests on Windows.

diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
index 3060c6c2cd2c52a93eddf0f005d2f5ccd4fb05b3..e187cc1813fe30e93452e3f7c6051afabb22ee5a 100644 (file)
--- 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 e6f085ebd69a84d2969dd67932a7ea8d792922f9..0f18b3305ce8828d7dd44f929c48ae4cf5ed56ce 100644 (file)
--- 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