fix test

Author: hauntsaninja

mypy/test/testpep561.py

@@ -6,8 +6,7 @@
 from subprocess import PIPE
 import sys
 import tempfile
-import venv
-from typing import Tuple, List, Generator
+from typing import Tuple, List, Iterator
 
 import mypy.api
 from mypy.test.config import package_path
@@ -44,15 +43,19 @@ def run_case(self, test_case: DataDrivenTestCase) -> None:
 
 
 @contextmanager
-def virtualenv(
-                python_executable: str = sys.executable
-                ) -> Generator[Tuple[str, str], None, None]:
+def virtualenv(python_executable: str = sys.executable) -> Iterator[Tuple[str, str]]:
     """Context manager that creates a virtualenv in a temporary directory
 
     Returns the path to the created Python executable
     """
     with tempfile.TemporaryDirectory() as venv_dir:
-        venv.create(venv_dir, with_pip=True, clear=True)
+        proc = subprocess.run(
+            [python_executable, '-m', 'venv', venv_dir],
+            cwd=os.getcwd(), stdout=PIPE, stderr=PIPE
+        )
+        if proc.returncode != 0:
+            err = proc.stdout.decode('utf-8') + proc.stderr.decode('utf-8')
+            raise Exception("Failed to create venv.\n" + err)
         if sys.platform == 'win32':
             yield venv_dir, os.path.abspath(os.path.join(venv_dir, 'Scripts', 'python'))
         else:

mypyc/test-data/run-imports.test

@@ -30,19 +30,19 @@ def test_import_as_submodule_within_function() -> None:
 #     assert 'nob' not in globals()
 
 def test_import_module_without_stub_in_function() -> None:
-    # 'virtualenv' must not have a stub in typeshed for this test case
-    import virtualenv  # type: ignore
+    # 'psutil' must not have a stub in typeshed for this test case
+    import psutil  # type: ignore
     # TODO: We shouldn't add local imports to globals()
-    # assert 'virtualenv' not in globals()
-    assert isinstance(virtualenv.__name__, str)
+    # assert 'psutil' not in globals()
+    assert isinstance(psutil.__name__, str)
 
 def test_import_as_module_without_stub_in_function() -> None:
-    # 'virtualenv' must not have a stub in typeshed for this test case
-    import virtualenv as vv  # type: ignore
-    assert 'virtualenv' not in globals()
+    # 'psutil' must not have a stub in typeshed for this test case
+    import psutil as pp  # type: ignore
+    assert 'psutil' not in globals()
     # TODO: We shouldn't add local imports to globals()
-    # assert 'vv' not in globals()
-    assert isinstance(vv.__name__, str)
+    # assert 'pp' not in globals()
+    assert isinstance(pp.__name__, str)
 
 [file testmodule.py]
 def factorial(x: int) -> int: