python · brettcannon · May 17, 2018 · May 17, 2018 · May 17, 2018 · May 17, 2018
diff --git a/Lib/test/libregrtest/save_env.py b/Lib/test/libregrtest/save_env.py
@@ -1,3 +1,4 @@
+import asyncio
 import builtins
 import locale
 import logging
@@ -65,8 +66,40 @@ def __init__(self, testname, verbose=0, quiet=False, *, pgo=False):
                  'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES',
                  'files', 'locale', 'warnings.showwarning',
                  'shutil_archive_formats', 'shutil_unpack_formats',
+                 'asyncio.get_event_loop_policy', 'asyncio.get_event_loop',
+                 'asyncio_get_exception_handler', 'asyncio_get_debug',
+                 'asyncio_get_child_watcher',
                 )
 
+    def get_asyncio_get_event_loop_policy(self):
+        return asyncio.get_event_loop_policy()
+    def restore_asyncio_get_event_loop_policy(self, policy):
+        asyncio.set_event_loop_policy(policy)
+
+    def get_asyncio_get_event_loop(self):
+        return asyncio.get_event_loop()
+    def restore_asyncio_get_event_loop(self, loop):
+        asyncio.set_event_loop(loop)
+
+    def get_asyncio_get_exception_handler(self):
+        return asyncio.get_event_loop().get_exception_handler()
+    def restore_asyncio_get_exception_handler(self, handler):
+        asyncio.get_event_loop().set_exception_handler(handler)
+
+    def get_asyncio_get_debug(self):
+        return asyncio.get_event_loop().get_debug()
+    def restore_asyncio_get_debug(self, enabled):
+        asyncio.get_event_loop().set_debug(enabled)
+
+    def get_asyncio_get_child_watcher(self):
+        try:
+            return asyncio.get_event_loop_policy().get_child_watcher()
+        except NotImplementedError:
+            return NotImplemented
+    def restore_asyncio_get_child_watcher(self, watcher):
+        if watcher is not NotImplemented:
+            asyncio.get_event_loop_policy().set_child_watcher(watcher)
+
     def get_sys_argv(self):
         return id(sys.argv), sys.argv, sys.argv[:]
     def restore_sys_argv(self, saved_argv):

diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
@@ -322,6 +322,7 @@ async def gen():
 class AsyncGenAsyncioTest(unittest.TestCase):
 
     def setUp(self):
+        self.addCleanup(asyncio.set_event_loop, asyncio.get_event_loop())
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
 

diff --git a/Lib/test/test_contextlib_async.py b/Lib/test/test_contextlib_async.py
@@ -11,14 +11,15 @@ def _async_test(func):
     """Decorator to turn an async function into a test case."""
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
+        old_loop = asyncio.get_event_loop()
         coro = func(*args, **kwargs)
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
         try:
             return loop.run_until_complete(coro)
         finally:
             loop.close()
-            asyncio.set_event_loop(None)
+            asyncio.set_event_loop(old_loop)
     return wrapper
 
 
@@ -292,6 +293,7 @@ def __exit__(self, *exc_details):
     exit_stack = SyncAsyncExitStack
 
     def setUp(self):
+        self.addCleanup(asyncio.set_event_loop, asyncio.get_event_loop())
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(self.loop)
         self.addCleanup(self.loop.close)

diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
@@ -2134,6 +2134,7 @@ async def f():
                 raise MyException
             buffer.append('unreachable')
 
+        old_loop = asyncio.get_event_loop()
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
         try:
@@ -2142,7 +2143,7 @@ async def f():
             pass
         finally:
             loop.close()
-            asyncio.set_event_loop(None)
+            asyncio.set_event_loop(old_loop)
 
         self.assertEqual(buffer, [1, 2, 'MyException'])
 

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
@@ -1,37 +1,37 @@
 import unittest
 from test import support
 
+import _thread as thread
+import array
+import contextlib
 import errno
+try:
+    import fcntl
+except ImportError:
+    fcntl = None
 import io
 import itertools
-import socket
-import select
-import tempfile
-import time
-import traceback
-import queue
-import sys
-import os
-import array
-import contextlib
-from weakref import proxy
-import signal
 import math
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = False
+import os
 import pickle
-import struct
+import queue
 import random
+import select
 import shutil
+import signal
+import socket
 import string
-import _thread as thread
+import struct
+import sys
+import tempfile
 import threading
-try:
-    import multiprocessing
-except ImportError:
-    multiprocessing = False
-try:
-    import fcntl
-except ImportError:
-    fcntl = None
+import time
+import traceback
+from weakref import proxy
 
 HOST = support.HOST
 MSG = 'Michael Gilfix was here\u1234\r\n'.encode('utf-8') ## test unicode string and carriage return

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
@@ -634,6 +634,7 @@ def no_jump_without_trace_function():
 
 class JumpTestCase(unittest.TestCase):
     def setUp(self):
+        self.addCleanup(asyncio.set_event_loop, asyncio.get_event_loop())
         self.addCleanup(sys.settrace, sys.gettrace())
         sys.settrace(None)
 

diff --git a/Misc/NEWS.d/next/Tests/2018-05-17-16-50-06.bpo-33562.qmmv60.rst b/Misc/NEWS.d/next/Tests/2018-05-17-16-50-06.bpo-33562.qmmv60.rst
@@ -0,0 +1 @@
+Verify that tests are not modifying global settings for asyncio.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Verify that tests are not modifying global settings for asyncio.