From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 20 Oct 2016 05:10:44 +0000 (+0000)
Subject: Issue #28480: Adjust or skip tests if multithreading is disabled
X-Git-Tag: v3.6.0b3~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94332cba0f0a020f35590f1c2da23a579e3e9f3a;p=thirdparty%2FPython%2Fcpython.git

Issue #28480: Adjust or skip tests if multithreading is disabled
---

diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
index 41b1b4f4b485..c24fbea5b094 100644
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -1,4 +1,3 @@
-import asyncio
 import inspect
 import sys
 import types
@@ -6,6 +5,9 @@ import unittest
 
 from unittest import mock
 
+from test.support import import_module
+asyncio = import_module("asyncio")
+
 
 class AwaitException(Exception):
     pass
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index e45a982dbf70..078a86b359a2 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -4304,7 +4304,7 @@ class MiscTestCase(unittest.TestCase):
                      'logProcesses', 'currentframe',
                      'PercentStyle', 'StrFormatStyle', 'StringTemplateStyle',
                      'Filterer', 'PlaceHolder', 'Manager', 'RootLogger',
-                     'root'}
+                     'root', 'threading'}
         support.check__all__(self, logging, blacklist=blacklist)