From a1bc78b4f014d89a8c434307fa59f1a00064e3af Mon Sep 17 00:00:00 2001 From: schlamar Date: Tue, 6 May 2014 11:35:51 +0200 Subject: [PATCH] Fixed tests on Windows. --- tornado/test/ioloop_test.py | 2 +- tornado/test/netutil_test.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- 2.47.2