Merge pull request #1045 from schlamar/fix-win-tests

Fixed tests on Windows.
tornadoweb · May 6, 2014 · 41c4116 · 41c4116
2 parents 63ff9d6 + a1bc78b
commit 41c4116
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
@@ -219,7 +219,7 @@ def handle_connection(fd, events):
             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
@@ -96,6 +96,7 @@ def tearDown(self):
 
 @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