diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-12-18 12:28:08 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-12-18 12:28:08 +0100 |
commit | 5fb15e5a4ba08dfa7a1985422578ca1da88eefdd (patch) | |
tree | 927f9a2c8cc435fd5e2d08eb3c3176a3e068f770 /tests | |
parent | f37ac51750043efeafd94151ef8f38c838509e6d (diff) | |
download | trollius-5fb15e5a4ba08dfa7a1985422578ca1da88eefdd.tar.gz |
Copy a subset of test.support from CPython 3.5 to no more depend on the test
module to run the asyncio test suite. The test module is rarely installed.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_base_events.py | 12 | ||||
-rw-r--r-- | tests/test_events.py | 5 | ||||
-rw-r--r-- | tests/test_futures.py | 5 | ||||
-rw-r--r-- | tests/test_subprocess.py | 12 | ||||
-rw-r--r-- | tests/test_tasks.py | 8 | ||||
-rw-r--r-- | tests/test_windows_utils.py | 11 |
6 files changed, 37 insertions, 16 deletions
diff --git a/tests/test_base_events.py b/tests/test_base_events.py index db9d732..4e5b6ca 100644 --- a/tests/test_base_events.py +++ b/tests/test_base_events.py @@ -8,13 +8,17 @@ import sys import time import unittest from unittest import mock -from test.script_helper import assert_python_ok -from test.support import IPV6_ENABLED, gc_collect import asyncio from asyncio import base_events from asyncio import constants from asyncio import test_utils +try: + from test.script_helper import assert_python_ok + from test import support +except ImportError: + from asyncio import test_support as support + from asyncio.test_support import assert_python_ok MOCK_ANY = mock.ANY @@ -634,7 +638,7 @@ class BaseEventLoopTests(test_utils.TestCase): except KeyboardInterrupt: pass self.loop.close() - gc_collect() + support.gc_collect() self.assertFalse(self.loop.call_exception_handler.called) @@ -1066,7 +1070,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.assertRaises( OSError, self.loop.run_until_complete, coro) - @unittest.skipUnless(IPV6_ENABLED, 'IPv6 not supported or enabled') + @unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 not supported or enabled') def test_create_datagram_endpoint_no_matching_family(self): coro = self.loop.create_datagram_endpoint( asyncio.DatagramProtocol, diff --git a/tests/test_events.py b/tests/test_events.py index d7e2f34..0630292 100644 --- a/tests/test_events.py +++ b/tests/test_events.py @@ -20,13 +20,16 @@ import errno import unittest from unittest import mock import weakref -from test import support # find_unused_port, IPV6_ENABLED, TEST_HOME_DIR import asyncio from asyncio import proactor_events from asyncio import selector_events from asyncio import test_utils +try: + from test import support # find_unused_port, IPV6_ENABLED, TEST_HOME_DIR +except ImportError: + from asyncio import test_support as support def data_file(filename): diff --git a/tests/test_futures.py b/tests/test_futures.py index 371d351..f9c3ad2 100644 --- a/tests/test_futures.py +++ b/tests/test_futures.py @@ -5,11 +5,14 @@ import re import sys import threading import unittest -from test import support from unittest import mock import asyncio from asyncio import test_utils +try: + from test import support # gc_collect +except ImportError: + from asyncio import test_support as support def _fakefunc(f): diff --git a/tests/test_subprocess.py b/tests/test_subprocess.py index 5c0a2c8..08c8ac2 100644 --- a/tests/test_subprocess.py +++ b/tests/test_subprocess.py @@ -1,13 +1,17 @@ -from asyncio import subprocess -from asyncio import test_utils -import asyncio import signal import sys import unittest from unittest import mock -from test import support + +import asyncio +from asyncio import subprocess +from asyncio import test_utils if sys.platform != 'win32': from asyncio import unix_events +try: + from test import support # PIPE_MAX_SIZE +except ImportError: + from asyncio import test_support as support # Program blocking PROGRAM_BLOCKED = [sys.executable, '-c', 'import time; time.sleep(3600)'] diff --git a/tests/test_tasks.py b/tests/test_tasks.py index 770f218..25b21dc 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -6,9 +6,13 @@ import sys import types import unittest import weakref -from test import support -from test.script_helper import assert_python_ok from unittest import mock +try: + from test import support # gc_collect + from test.script_helper import assert_python_ok +except ImportError: + from asyncio import test_support as support + from asyncio.test_support import assert_python_ok import asyncio from asyncio import coroutines diff --git a/tests/test_windows_utils.py b/tests/test_windows_utils.py index 3e7a211..b957949 100644 --- a/tests/test_windows_utils.py +++ b/tests/test_windows_utils.py @@ -2,11 +2,14 @@ import socket import sys -import test.support import unittest -from test.support import IPV6_ENABLED from unittest import mock +try: + from test import support # gc_collect, IPV6_ENABLED +except ImportError: + from asyncio import test_support as support + if sys.platform != 'win32': raise unittest.SkipTest('Windows only') @@ -28,7 +31,7 @@ class WinsocketpairTests(unittest.TestCase): ssock, csock = windows_utils.socketpair() self.check_winsocketpair(ssock, csock) - @unittest.skipUnless(IPV6_ENABLED, 'IPv6 not supported or enabled') + @unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 not supported or enabled') def test_winsocketpair_ipv6(self): ssock, csock = windows_utils.socketpair(family=socket.AF_INET6) self.check_winsocketpair(ssock, csock) @@ -114,7 +117,7 @@ class PipeTests(unittest.TestCase): # check garbage collection of p closes handle del p - test.support.gc_collect() + support.gc_collect() try: _winapi.CloseHandle(h) except OSError as e: |