summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorTal Einat <taleinat+github@gmail.com>2018-06-10 07:10:28 (GMT)
committerGitHub <noreply@github.com>2018-06-10 07:10:28 (GMT)
commit4ab4695388fb9ec03a14d93e90ce50d832a920ec (patch)
tree3af450d5bc692cfac504a6a0a2b92d0cf05326a1 /Lib/unittest
parent1b85c71a2136d3fa6a1da05b27b1fe4e4b8ee45e (diff)
downloadcpython-4ab4695388fb9ec03a14d93e90ce50d832a920ec.zip
cpython-4ab4695388fb9ec03a14d93e90ce50d832a920ec.tar.gz
cpython-4ab4695388fb9ec03a14d93e90ce50d832a920ec.tar.bz2
bpo-33748: fix tests altering sys.path and sys.modules (GH-7433)
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/test/test_discovery.py39
1 files changed, 20 insertions, 19 deletions
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index 227b44a..204043b 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -4,10 +4,11 @@ import re
import sys
import types
import pickle
-import builtins
from test import support
+import test.test_importlib.util
import unittest
+import unittest.mock
import unittest.test
@@ -820,7 +821,6 @@ class TestDiscovery(unittest.TestCase):
def test_discovery_from_dotted_namespace_packages(self):
loader = unittest.TestLoader()
- orig_import = __import__
package = types.ModuleType('package')
package.__path__ = ['/a', '/b']
package.__spec__ = types.SimpleNamespace(
@@ -832,11 +832,6 @@ class TestDiscovery(unittest.TestCase):
sys.modules[packagename] = package
return package
- def cleanup():
- builtins.__import__ = orig_import
- self.addCleanup(cleanup)
- builtins.__import__ = _import
-
_find_tests_args = []
def _find_tests(start_dir, pattern, namespace=None):
_find_tests_args.append((start_dir, pattern))
@@ -844,28 +839,34 @@ class TestDiscovery(unittest.TestCase):
loader._find_tests = _find_tests
loader.suiteClass = list
- suite = loader.discover('package')
+
+ with unittest.mock.patch('builtins.__import__', _import):
+ # Since loader.discover() can modify sys.path, restore it when done.
+ with support.DirsOnSysPath():
+ # Make sure to remove 'package' from sys.modules when done.
+ with test.test_importlib.util.uncache('package'):
+ suite = loader.discover('package')
+
self.assertEqual(suite, ['/a/tests', '/b/tests'])
def test_discovery_failed_discovery(self):
loader = unittest.TestLoader()
package = types.ModuleType('package')
- orig_import = __import__
def _import(packagename, *args, **kwargs):
sys.modules[packagename] = package
return package
- def cleanup():
- builtins.__import__ = orig_import
- self.addCleanup(cleanup)
- builtins.__import__ = _import
-
- with self.assertRaises(TypeError) as cm:
- loader.discover('package')
- self.assertEqual(str(cm.exception),
- 'don\'t know how to discover from {!r}'
- .format(package))
+ with unittest.mock.patch('builtins.__import__', _import):
+ # Since loader.discover() can modify sys.path, restore it when done.
+ with support.DirsOnSysPath():
+ # Make sure to remove 'package' from sys.modules when done.
+ with test.test_importlib.util.uncache('package'):
+ with self.assertRaises(TypeError) as cm:
+ loader.discover('package')
+ self.assertEqual(str(cm.exception),
+ 'don\'t know how to discover from {!r}'
+ .format(package))
if __name__ == '__main__':