@zzzen/pyright-internal 1.2.0-dev.20230924 → 1.2.0-dev.20231001

package/dist/tests/importResolver.test.js

@@ -11,498 +11,554 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const importResolver_1 = require("../analyzer/importResolver");
 const configOptions_1 = require("../common/configOptions");
+const fullAccessHost_1 = require("../common/fullAccessHost");
 const pathConsts_1 = require("../common/pathConsts");
 const pathUtils_1 = require("../common/pathUtils");
+const realFileSystem_1 = require("../common/realFileSystem");
+const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
 const pyrightFileSystem_1 = require("../pyrightFileSystem");
 const testAccessHost_1 = require("./harness/testAccessHost");
 const filesystem_1 = require("./harness/vfs/filesystem");
-const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
 const libraryRoot = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), pathConsts_1.lib, pathConsts_1.sitePackages);
-test('partial stub file exists', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    const importResult = getImportResult(files, ['myLib', 'partialStub']);
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi')).length);
-});
-test('partial stub __init__ exists', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    const importResult = getImportResult(files, ['myLib']);
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
-});
-test('side by side files', () => {
-    const myFile = (0, pathUtils_1.combinePaths)('src', 'file.py');
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
-            content: 'def test(): pass',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub2.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub2.py'),
-            content: 'def test(): pass',
-        },
-        {
-            path: myFile,
-            content: '# not used',
-        },
-    ];
-    const sp = createServiceProviderFromFiles(files);
-    const configOptions = new configOptions_1.ConfigOptions((0, pathUtils_1.normalizeSlashes)('/'));
-    const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
-    // Stub package wins over original package (per PEP 561 rules).
-    const sideBySideResult = importResolver.resolveImport(myFile, configOptions.findExecEnvironment(myFile), {
-        leadingDots: 0,
-        nameParts: ['myLib', 'partialStub'],
-        importedSymbols: new Set(),
+function usingTrueVenv() {
+    return process.env.CI_IMPORT_TEST_VENVPATH !== undefined || process.env.CI_IMPORT_TEST_PYTHONPATH !== undefined;
+}
+if (!usingTrueVenv()) {
+    describe('Import tests that cannot run in a true venv', () => {
+        test('partial stub file exists', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                    content: 'partial\n',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
+                    content: 'def test(): pass',
+                },
+            ];
+            const importResult = getImportResult(files, ['myLib', 'partialStub']);
+            (0, assert_1.default)(importResult.isImportFound);
+            (0, assert_1.default)(importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi'))
+                .length);
+        });
+        test('partial stub __init__ exists', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                    content: 'partial\n',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                    content: 'def test(): pass',
+                },
+            ];
+            const importResult = getImportResult(files, ['myLib']);
+            (0, assert_1.default)(importResult.isImportFound);
+            (0, assert_1.default)(importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi'))
+                .length);
+        });
+        test('stub package', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'stub.pyi'),
+                    content: '# empty',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                    content: '# empty',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
+                    content: 'def test(): pass',
+                },
+            ];
+            // If fully typed stub package exists, that wins over the real package.
+            const importResult = getImportResult(files, ['myLib', 'partialStub']);
+            (0, assert_1.default)(!importResult.isImportFound);
+        });
+        test('partial stub package in typing folder', () => {
+            const typingFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'typing');
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib-stubs', '__init__.pyi'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib-stubs', 'py.typed'),
+                    content: 'partial\n',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                    content: 'def test(): pass',
+                },
+            ];
+            const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = typingFolder));
+            (0, assert_1.default)(importResult.isImportFound);
+            (0, assert_1.default)(importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi'))
+                .length);
+        });
+        test('typeshed folder', () => {
+            const typeshedFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'ts');
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                    content: 'partial\n',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(typeshedFolder, 'stubs', 'myLibPackage', 'myLib.pyi'),
+                    content: '# empty',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                    content: 'def test(): pass',
+                },
+            ];
+            // Stub packages win over typeshed.
+            const importResult = getImportResult(files, ['myLib'], (c) => (c.typeshedPath = typeshedFolder));
+            (0, assert_1.default)(importResult.isImportFound);
+            (0, assert_1.default)(importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi'))
+                .length);
+        });
+        test('typeshed fallback folder', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                    content: 'partial\n',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'myLibPackage', 'myLib.pyi'),
+                    content: '# empty',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                    content: 'def test(): pass',
+                },
+            ];
+            // Stub packages win over typeshed.
+            const importResult = getImportResult(files, ['myLib']);
+            (0, assert_1.default)(importResult.isImportFound);
+            (0, assert_1.default)(importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi'))
+                .length);
+        });
+        test('py.typed file', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                    content: 'partial\n',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                    content: 'def test(): pass',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
+                    content: '# typed',
+                },
+            ];
+            // Partial stub package always overrides original package.
+            const importResult = getImportResult(files, ['myLib']);
+            (0, assert_1.default)(importResult.isImportFound);
+            (0, assert_1.default)(importResult.isStubFile);
+        });
+        test('py.typed library', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', '__init__.py'),
+                    content: 'def test(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', 'py.typed'),
+                    content: '',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'os', 'os', '__init__.pyi'),
+                    content: '# empty',
+                },
+            ];
+            const importResult = getImportResult(files, ['os']);
+            (0, assert_1.default)(importResult.isImportFound);
+            assert_1.default.strictEqual(files[0].path, importResult.resolvedPaths[importResult.resolvedPaths.length - 1]);
+        });
+        test('import side by side file sub under lib folder', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)('/lib/site-packages/myLib', 'file1.py'),
+                    content: 'def test1(): ...',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)('/lib/site-packages/myLib', 'file2.py'),
+                    content: 'def test2(): ...',
+                },
+            ];
+            const importResult = getImportResult(files, ['file1']);
+            (0, assert_1.default)(!importResult.isImportFound);
+        });
     });
-    (0, assert_1.default)(sideBySideResult.isImportFound);
-    (0, assert_1.default)(sideBySideResult.isStubFile);
-    const sideBySideStubFile = (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi');
-    assert_1.default.strictEqual(1, sideBySideResult.resolvedPaths.filter((f) => f === sideBySideStubFile).length);
-    assert_1.default.strictEqual('def test(): ...', sp.fs().readFileSync(sideBySideStubFile, 'utf8'));
-    // Side by side stub doesn't completely disable partial stub.
-    const partialStubResult = importResolver.resolveImport(myFile, configOptions.findExecEnvironment(myFile), {
-        leadingDots: 0,
-        nameParts: ['myLib', 'partialStub2'],
-        importedSymbols: new Set(),
+}
+describe('Import tests that can run with or without a true venv', () => {
+    test('side by side files', () => {
+        const myFile = (0, pathUtils_1.combinePaths)('src', 'file.py');
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
+                content: 'def test(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                content: 'partial\n',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi'),
+                content: '# empty',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
+                content: 'def test(): pass',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub2.pyi'),
+                content: 'def test(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub2.py'),
+                content: 'def test(): pass',
+            },
+            {
+                path: myFile,
+                content: '# not used',
+            },
+        ];
+        const sp = createServiceProviderFromFiles(files);
+        const configOptions = new configOptions_1.ConfigOptions((0, pathUtils_1.normalizeSlashes)('/'));
+        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
+        // Stub package wins over original package (per PEP 561 rules).
+        const sideBySideResult = importResolver.resolveImport(myFile, configOptions.findExecEnvironment(myFile), {
+            leadingDots: 0,
+            nameParts: ['myLib', 'partialStub'],
+            importedSymbols: new Set(),
+        });
+        (0, assert_1.default)(sideBySideResult.isImportFound);
+        (0, assert_1.default)(sideBySideResult.isStubFile);
+        const sideBySideStubFile = (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi');
+        assert_1.default.strictEqual(1, sideBySideResult.resolvedPaths.filter((f) => f === sideBySideStubFile).length);
+        assert_1.default.strictEqual('def test(): ...', sp.fs().readFileSync(sideBySideStubFile, 'utf8'));
+        // Side by side stub doesn't completely disable partial stub.
+        const partialStubResult = importResolver.resolveImport(myFile, configOptions.findExecEnvironment(myFile), {
+            leadingDots: 0,
+            nameParts: ['myLib', 'partialStub2'],
+            importedSymbols: new Set(),
+        });
+        (0, assert_1.default)(partialStubResult.isImportFound);
+        (0, assert_1.default)(partialStubResult.isStubFile);
+        const partialStubFile = (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub2.pyi');
+        assert_1.default.strictEqual(1, partialStubResult.resolvedPaths.filter((f) => f === partialStubFile).length);
     });
-    (0, assert_1.default)(partialStubResult.isImportFound);
-    (0, assert_1.default)(partialStubResult.isStubFile);
-    const partialStubFile = (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub2.pyi');
-    assert_1.default.strictEqual(1, partialStubResult.resolvedPaths.filter((f) => f === partialStubFile).length);
-});
-test('stub package', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'stub.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    // If fully typed stub package exists, that wins over the real package.
-    const importResult = getImportResult(files, ['myLib', 'partialStub']);
-    (0, assert_1.default)(!importResult.isImportFound);
-});
-test('stub namespace package', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'stub.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    // If fully typed stub package exists, that wins over the real package.
-    const importResult = getImportResult(files, ['myLib', 'partialStub']);
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(!importResult.isStubFile);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py')).length);
-});
-test('stub in typing folder over partial stub package', () => {
-    const typingFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'typing');
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    // If the package exists in typing folder, that gets picked up first.
-    const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = typingFolder));
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-    assert_1.default.strictEqual(0, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
-});
-test('partial stub package in typing folder', () => {
-    const typingFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'typing');
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib-stubs', '__init__.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = typingFolder));
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
-});
-test('typeshed folder', () => {
-    const typeshedFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'ts');
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(typeshedFolder, 'stubs', 'myLibPackage', 'myLib.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    // Stub packages win over typeshed.
-    const importResult = getImportResult(files, ['myLib'], (c) => (c.typeshedPath = typeshedFolder));
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
-});
-test('typeshed fallback folder', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'myLibPackage', 'myLib.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-            content: 'def test(): pass',
-        },
-    ];
-    // Stub packages win over typeshed.
-    const importResult = getImportResult(files, ['myLib']);
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
-});
-test('py.typed file', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-            content: 'partial\n',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-            content: 'def test(): pass',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
-            content: '# typed',
-        },
-    ];
-    // Partial stub package always overrides original package.
-    const importResult = getImportResult(files, ['myLib']);
-    (0, assert_1.default)(importResult.isImportFound);
-    (0, assert_1.default)(importResult.isStubFile);
-});
-test('py.typed library', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', '__init__.py'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', 'py.typed'),
-            content: '',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'os', 'os', '__init__.pyi'),
-            content: '# empty',
-        },
-    ];
-    const importResult = getImportResult(files, ['os']);
-    (0, assert_1.default)(importResult.isImportFound);
-    assert_1.default.strictEqual(files[0].path, importResult.resolvedPaths[importResult.resolvedPaths.length - 1]);
-});
-test('non py.typed library', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', '__init__.py'),
-            content: 'def test(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'os', 'os', '__init__.pyi'),
-            content: '# empty',
-        },
-    ];
-    const importResult = getImportResult(files, ['os']);
-    (0, assert_1.default)(importResult.isImportFound);
-    assert_1.default.strictEqual(files[1].path, importResult.resolvedPaths[importResult.resolvedPaths.length - 1]);
-});
-test('no empty import roots', () => {
-    const sp = createServiceProviderFromFiles([]);
-    const configOptions = new configOptions_1.ConfigOptions(''); // Empty, like open-file mode.
-    const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
-    importResolver.getImportRoots(configOptions.getDefaultExecEnvironment()).forEach((path) => (0, assert_1.default)(path));
-});
-test('multiple typeshedFallback', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib', 'aLib', '__init__.pyi'),
-            content: '# empty',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'bLib', 'bLib', '__init__.pyi'),
-            content: '# empty',
-        },
-    ];
-    const sp = createServiceProviderFromFiles(files);
-    const configOptions = new configOptions_1.ConfigOptions(''); // Empty, like open-file mode.
-    const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
-    const importRoots = importResolver.getImportRoots(configOptions.getDefaultExecEnvironment());
-    assert_1.default.strictEqual(1, importRoots.filter((f) => f === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib')).length);
-    assert_1.default.strictEqual(1, importRoots.filter((f) => f === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'bLib')).length);
-});
-test('import side by side file root', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
-            content: 'def test1(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'file2.py'),
-            content: 'def test2(): ...',
-        },
-    ];
-    const importResult = getImportResult(files, ['file1']);
-    (0, assert_1.default)(importResult.isImportFound);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/', 'file1.py')).length);
-});
-test('import side by side file sub folder', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/test', 'file1.py'),
-            content: 'def test1(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/test', 'file2.py'),
-            content: 'def test2(): ...',
-        },
-    ];
-    const importResult = getImportResult(files, ['file1']);
-    (0, assert_1.default)(importResult.isImportFound);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/test', 'file1.py')).length);
-});
-test('import side by side file sub under src folder', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'),
-            content: 'def test1(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/src/nested', 'file2.py'),
-            content: 'def test2(): ...',
-        },
-    ];
-    const importResult = getImportResult(files, ['file1']);
-    (0, assert_1.default)(importResult.isImportFound);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py')).length);
-});
-test('import file sub under containing folder', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'),
-            content: 'def test1(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/src/nested/nested2', 'file2.py'),
-            content: 'def test2(): ...',
-        },
-    ];
-    const importResult = getImportResult(files, ['file1']);
-    (0, assert_1.default)(importResult.isImportFound);
-    assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py')).length);
-});
-test('import side by side file sub under lib folder', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/lib/site-packages/myLib', 'file1.py'),
-            content: 'def test1(): ...',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/lib/site-packages/myLib', 'file2.py'),
-            content: 'def test2(): ...',
-        },
-    ];
-    const importResult = getImportResult(files, ['file1']);
-    (0, assert_1.default)(!importResult.isImportFound);
-});
-test("don't walk up the root", () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
-            content: 'def test1(): ...',
-        },
-    ];
-    const importResult = getImportResult(files, ['notExist'], (c) => (c.projectRoot = ''));
-    (0, assert_1.default)(!importResult.isImportFound);
-});
-test('nested namespace package 1', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', 'd.py'),
-            content: 'def f(): pass',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', '__init__.py'),
-            content: '',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', '__init__.py'),
-            content: '',
-        },
-    ];
-    const importResult = getImportResult(files, ['a', 'b', 'c', 'd'], (config) => {
-        config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+    test('stub namespace package', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'stub.pyi'),
+                content: '# empty',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
+                content: 'def test(): pass',
+            },
+        ];
+        // If fully typed stub package exists, that wins over the real package.
+        const importResult = getImportResult(files, ['myLib', 'partialStub']);
+        (0, assert_1.default)(importResult.isImportFound);
+        (0, assert_1.default)(!importResult.isStubFile);
+        assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py')).length);
     });
-    (0, assert_1.default)(importResult.isImportFound);
-});
-test('nested namespace package 2', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', 'd.py'),
-            content: 'def f(): pass',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', '__init__.py'),
-            content: '',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', 'b', 'c', '__init__.py'),
-            content: '',
-        },
-    ];
-    const importResult = getImportResult(files, ['a', 'b', 'c', 'd'], (config) => {
-        config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+    test('stub in typing folder over partial stub package', () => {
+        const typingFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'typing');
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                content: 'def test(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
+                content: 'partial\n',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib.pyi'),
+                content: '# empty',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                content: 'def test(): pass',
+            },
+        ];
+        // If the package exists in typing folder, that gets picked up first.
+        const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = typingFolder));
+        (0, assert_1.default)(importResult.isImportFound);
+        (0, assert_1.default)(importResult.isStubFile);
+        assert_1.default.strictEqual(0, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
     });
-    (0, assert_1.default)(importResult.isImportFound);
-});
-test('nested namespace package 3', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', 'd.py'),
-            content: 'def f(): pass',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', '__init__.py'),
-            content: '',
-        },
-    ];
-    const importResult = getImportResult(files, ['a', 'b', 'c', 'd'], (config) => {
-        config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+    test('non py.typed library', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', '__init__.py'),
+                content: 'def test(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'os', 'os', '__init__.pyi'),
+                content: '# empty',
+            },
+        ];
+        const importResult = getImportResult(files, ['os']);
+        (0, assert_1.default)(importResult.isImportFound);
+        assert_1.default.strictEqual(files[1].path, importResult.resolvedPaths[importResult.resolvedPaths.length - 1]);
     });
-    (0, assert_1.default)(!importResult.isImportFound);
-});
-test('nested namespace package 4', () => {
-    const files = [
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', '__init__.py'),
-            content: '',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c.py'),
-            content: 'def f(): pass',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', '__init__.py'),
-            content: '',
-        },
-        {
-            path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', 'b', '__init__.py'),
-            content: '',
-        },
-    ];
-    const importResult = getImportResult(files, ['a', 'b', 'c'], (config) => {
-        config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+    test('no empty import roots', () => {
+        const sp = createServiceProviderFromFiles([]);
+        const configOptions = new configOptions_1.ConfigOptions(''); // Empty, like open-file mode.
+        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
+        importResolver.getImportRoots(configOptions.getDefaultExecEnvironment()).forEach((path) => (0, assert_1.default)(path));
+    });
+    test('multiple typeshedFallback', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib', 'aLib', '__init__.pyi'),
+                content: '# empty',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'bLib', 'bLib', '__init__.pyi'),
+                content: '# empty',
+            },
+        ];
+        const sp = createServiceProviderFromFiles(files);
+        const configOptions = new configOptions_1.ConfigOptions(''); // Empty, like open-file mode.
+        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
+        const importRoots = importResolver.getImportRoots(configOptions.getDefaultExecEnvironment());
+        assert_1.default.strictEqual(1, importRoots.filter((f) => f === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib')).length);
+        assert_1.default.strictEqual(1, importRoots.filter((f) => f === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'bLib')).length);
+    });
+    test('import side by side file root', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
+                content: 'def test1(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'file2.py'),
+                content: 'def test2(): ...',
+            },
+        ];
+        const importResult = getImportResult(files, ['file1']);
+        (0, assert_1.default)(importResult.isImportFound);
+        assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/', 'file1.py')).length);
+    });
+    test('import side by side file sub folder', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/test', 'file1.py'),
+                content: 'def test1(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/test', 'file2.py'),
+                content: 'def test2(): ...',
+            },
+        ];
+        const importResult = getImportResult(files, ['file1']);
+        (0, assert_1.default)(importResult.isImportFound);
+        assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/test', 'file1.py')).length);
+    });
+    test('import side by side file sub under src folder', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'),
+                content: 'def test1(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/src/nested', 'file2.py'),
+                content: 'def test2(): ...',
+            },
+        ];
+        const importResult = getImportResult(files, ['file1']);
+        (0, assert_1.default)(importResult.isImportFound);
+        assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py')).length);
+    });
+    test('import file sub under containing folder', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'),
+                content: 'def test1(): ...',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/src/nested/nested2', 'file2.py'),
+                content: 'def test2(): ...',
+            },
+        ];
+        const importResult = getImportResult(files, ['file1']);
+        (0, assert_1.default)(importResult.isImportFound);
+        assert_1.default.strictEqual(1, importResult.resolvedPaths.filter((f) => f === (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py')).length);
+    });
+    test("don't walk up the root", () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
+                content: 'def test1(): ...',
+            },
+        ];
+        const importResult = getImportResult(files, ['notExist'], (c) => (c.projectRoot = ''));
+        (0, assert_1.default)(!importResult.isImportFound);
+    });
+    test('nested namespace package 1', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', 'd.py'),
+                content: 'def f(): pass',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', '__init__.py'),
+                content: '',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', '__init__.py'),
+                content: '',
+            },
+        ];
+        const importResult = getImportResult(files, ['a', 'b', 'c', 'd'], (config) => {
+            config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+        });
+        (0, assert_1.default)(importResult.isImportFound);
+    });
+    test('nested namespace package 2', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', 'd.py'),
+                content: 'def f(): pass',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', '__init__.py'),
+                content: '',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', 'b', 'c', '__init__.py'),
+                content: '',
+            },
+        ];
+        const importResult = getImportResult(files, ['a', 'b', 'c', 'd'], (config) => {
+            config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+        });
+        (0, assert_1.default)(importResult.isImportFound);
+    });
+    test('nested namespace package 3', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c', 'd.py'),
+                content: 'def f(): pass',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', '__init__.py'),
+                content: '',
+            },
+        ];
+        const importResult = getImportResult(files, ['a', 'b', 'c', 'd'], (config) => {
+            config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+        });
+        (0, assert_1.default)(!importResult.isImportFound);
+    });
+    test('nested namespace package 4', () => {
+        const files = [
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', '__init__.py'),
+                content: '',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages1', 'a', 'b', 'c.py'),
+                content: 'def f(): pass',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', '__init__.py'),
+                content: '',
+            },
+            {
+                path: (0, pathUtils_1.combinePaths)('/', 'packages2', 'a', 'b', '__init__.py'),
+                content: '',
+            },
+        ];
+        const importResult = getImportResult(files, ['a', 'b', 'c'], (config) => {
+            config.defaultExtraPaths = [(0, pathUtils_1.combinePaths)('/', 'packages1'), (0, pathUtils_1.combinePaths)('/', 'packages2')];
+        });
+        (0, assert_1.default)(!importResult.isImportFound);
     });
-    (0, assert_1.default)(!importResult.isImportFound);
 });
-function getImportResult(files, nameParts, setup) {
-    setup =
-        setup !== null && setup !== void 0 ? setup : ((c) => {
-            /* empty */
+if (usingTrueVenv()) {
+    describe('Import tests that have to run with a venv', () => {
+        test('venv can find imports', () => {
+            var _a;
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
+                    content: 'import pytest',
+                },
+            ];
+            const importResult = getImportResult(files, ['pytest']);
+            (0, assert_1.default)(importResult.isImportFound, `Import not found: ${(_a = importResult.importFailureInfo) === null || _a === void 0 ? void 0 : _a.join('\n')}`);
         });
-    const sp = createServiceProviderFromFiles(files);
+    });
+}
+function getImportResult(files, nameParts, setup) {
+    const defaultHostFactory = (sp) => new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]);
+    const defaultSetup = setup !== null && setup !== void 0 ? setup : ((c) => {
+        /* empty */
+    });
+    const defaultSpFactory = (files) => createServiceProviderFromFiles(files);
+    // Use environment variables to determine how to create a host and how to modify the config options.
+    // These are set in the CI to test imports with different options.
+    let hostFactory = defaultHostFactory;
+    let configModifier = defaultSetup;
+    let spFactory = defaultSpFactory;
+    if (process.env.CI_IMPORT_TEST_VENVPATH) {
+        configModifier = (c) => {
+            defaultSetup(c);
+            c.venvPath = process.env.CI_IMPORT_TEST_VENVPATH;
+            c.venv = process.env.CI_IMPORT_TEST_VENV;
+        };
+        spFactory = (files) => createServiceProviderWithCombinedFs(files);
+    }
+    else if (process.env.CI_IMPORT_TEST_PYTHONPATH) {
+        configModifier = (c) => {
+            defaultSetup(c);
+            c.pythonPath = process.env.CI_IMPORT_TEST_PYTHONPATH;
+        };
+        hostFactory = (sp) => new TruePythonTestAccessHost();
+        spFactory = (files) => createServiceProviderWithCombinedFs(files);
+    }
+    return getImportResultImpl(files, nameParts, spFactory, configModifier, hostFactory);
+}
+function getImportResultImpl(files, nameParts, spFactory, configModifier, hostFactory) {
+    const sp = spFactory(files);
     const configOptions = new configOptions_1.ConfigOptions((0, pathUtils_1.normalizeSlashes)('/'));
-    setup(configOptions);
+    configModifier(configOptions);
     const file = files.length > 0 ? files[files.length - 1].path : (0, pathUtils_1.combinePaths)('src', 'file.py');
     if (files.length === 0) {
         files.push({
@@ -510,7 +566,7 @@ function getImportResult(files, nameParts, setup) {
             content: '# not used',
         });
     }
-    const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [libraryRoot]));
+    const importResolver = new importResolver_1.ImportResolver(sp, configOptions, hostFactory(sp));
     const importResult = importResolver.resolveImport(file, configOptions.findExecEnvironment(file), {
         leadingDots: 0,
         nameParts: nameParts,
@@ -518,7 +574,7 @@ function getImportResult(files, nameParts, setup) {
     });
     return importResult;
 }
-function createFileSystem(files) {
+function createTestFileSystem(files) {
     const fs = new filesystem_1.TestFileSystem(/* ignoreCase */ false, { cwd: (0, pathUtils_1.normalizeSlashes)('/') });
     for (const file of files) {
         const path = (0, pathUtils_1.normalizeSlashes)(file.path);
@@ -526,10 +582,127 @@ function createFileSystem(files) {
         fs.mkdirpSync(dir);
         fs.writeFileSync(path, file.content);
     }
-    return new pyrightFileSystem_1.PyrightFileSystem(fs);
+    return fs;
 }
 function createServiceProviderFromFiles(files) {
-    const fs = createFileSystem(files);
+    const fs = new pyrightFileSystem_1.PyrightFileSystem(createTestFileSystem(files));
     return (0, serviceProviderExtensions_1.createServiceProvider)(fs);
 }
+function createServiceProviderWithCombinedFs(files) {
+    const fs = new pyrightFileSystem_1.PyrightFileSystem(new CombinedFileSystem(createTestFileSystem(files)));
+    return (0, serviceProviderExtensions_1.createServiceProvider)(fs);
+}
+class TruePythonTestAccessHost extends fullAccessHost_1.FullAccessHost {
+    constructor() {
+        super((0, realFileSystem_1.createFromRealFileSystem)());
+    }
+}
+class CombinedFileSystem {
+    constructor(_testFS) {
+        this._testFS = _testFS;
+        this._realFS = (0, realFileSystem_1.createFromRealFileSystem)();
+    }
+    mkdirSync(path, options) {
+        this._testFS.mkdirSync(path, options);
+    }
+    writeFileSync(path, data, encoding) {
+        this._testFS.writeFileSync(path, data, encoding);
+    }
+    unlinkSync(path) {
+        this._testFS.unlinkSync(path);
+    }
+    rmdirSync(path) {
+        this._testFS.rmdirSync(path);
+    }
+    createFileSystemWatcher(paths, listener) {
+        return this._testFS.createFileSystemWatcher(paths, listener);
+    }
+    createReadStream(path) {
+        return this._testFS.createReadStream(path);
+    }
+    createWriteStream(path) {
+        return this._testFS.createWriteStream(path);
+    }
+    copyFileSync(src, dst) {
+        this._testFS.copyFileSync(src, dst);
+    }
+    tmpdir() {
+        return this._testFS.tmpdir();
+    }
+    tmpfile(options) {
+        return this._testFS.tmpfile(options);
+    }
+    dispose() {
+        this._testFS.dispose();
+    }
+    existsSync(path) {
+        return this._testFS.existsSync(path) || this._realFS.existsSync(path);
+    }
+    chdir(path) {
+        this._testFS.chdir(path);
+    }
+    readdirEntriesSync(path) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.readdirEntriesSync(path);
+        }
+        return this._realFS.readdirEntriesSync(path);
+    }
+    readdirSync(path) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.readdirSync(path);
+        }
+        return this._realFS.readdirSync(path);
+    }
+    readFileSync(path, encoding = null) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.readFileSync(path, encoding);
+        }
+        return this._realFS.readFileSync(path, encoding);
+    }
+    statSync(path) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.statSync(path);
+        }
+        return this._realFS.statSync(path);
+    }
+    realpathSync(path) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.realpathSync(path);
+        }
+        return this._realFS.realpathSync(path);
+    }
+    getModulePath() {
+        return this._testFS.getModulePath();
+    }
+    readFile(path) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.readFile(path);
+        }
+        return this._realFS.readFile(path);
+    }
+    readFileText(path, encoding) {
+        if (this._testFS.existsSync(path)) {
+            return this._testFS.readFileText(path, encoding);
+        }
+        return this._realFS.readFileText(path, encoding);
+    }
+    realCasePath(path) {
+        return this._testFS.realCasePath(path);
+    }
+    isMappedFilePath(filepath) {
+        return this._testFS.isMappedFilePath(filepath);
+    }
+    getOriginalFilePath(mappedFilePath) {
+        return this._testFS.getOriginalFilePath(mappedFilePath);
+    }
+    getMappedFilePath(originalFilepath) {
+        return this._testFS.getMappedFilePath(originalFilepath);
+    }
+    getUri(path) {
+        return this._testFS.getUri(path);
+    }
+    isInZip(path) {
+        return this._testFS.isInZip(path);
+    }
+}
 //# sourceMappingURL=importResolver.test.js.map