@zzzen/pyright-internal 1.2.0-dev.20250112 → 1.2.0-dev.20250126

package/dist/tests/importResolver.test.js

@@ -26,32 +26,235 @@ const libraryRoot = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlash
 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', () => {
+describe('Import tests with fake venv', () => {
+    const tempFile = new realFileSystem_1.RealTempFile();
+    afterAll(() => tempFile.dispose());
+    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.resolvedUris.filter((f) => !f.isEmpty() && f.getFilePath() === (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.resolvedUris.filter((f) => f.getFilePath() === (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 = uriUtils_1.UriEx.file(typingFolder)));
+                (0, assert_1.default)(importResult.isImportFound);
+                (0, assert_1.default)(importResult.isStubFile);
+                assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (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 = uriUtils_1.UriEx.file(typeshedFolder)));
+                (0, assert_1.default)(importResult.isImportFound);
+                (0, assert_1.default)(importResult.isStubFile);
+                assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (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.resolvedUris.filter((f) => f.getFilePath() === (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.resolvedUris[importResult.resolvedUris.length - 1].getFilePath());
+            });
+            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('getModuleNameForImport library file', () => {
             const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
-                    content: 'def test(): ...',
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'myModule', 'file1.py'),
+                    content: '# empty',
                 },
+            ];
+            const moduleImportInfo = getModuleNameForImport(files);
+            assert_1.default.strictEqual(moduleImportInfo.importType, 1 /* ImportType.ThirdParty */);
+            (0, assert_1.default)(!moduleImportInfo.isThirdPartyPyTypedPresent);
+            (0, assert_1.default)(!moduleImportInfo.isLocalTypingsFile);
+        });
+        test('getModuleNameForImport py.typed library file', () => {
+            const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-                    content: 'partial\n',
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
+                    content: '',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
-                    content: 'def test(): pass',
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'myModule', 'file1.py'),
+                    content: '# empty',
                 },
             ];
-            const importResult = getImportResult(files, ['myLib', 'partialStub']);
-            (0, assert_1.default)(importResult.isImportFound);
-            (0, assert_1.default)(importResult.isStubFile);
-            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi')).length);
+            const moduleImportInfo = getModuleNameForImport(files);
+            assert_1.default.strictEqual(moduleImportInfo.importType, 1 /* ImportType.ThirdParty */);
+            (0, assert_1.default)(moduleImportInfo.isThirdPartyPyTypedPresent);
+            (0, assert_1.default)(!moduleImportInfo.isLocalTypingsFile);
         });
-        test('partial stub __init__ exists', () => {
+    }
+    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', '__init__.pyi'),
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
                     content: 'def test(): ...',
                 },
                 {
@@ -59,25 +262,58 @@ if (!usingTrueVenv()) {
                     content: 'partial\n',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
+                    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 importResult = getImportResult(files, ['myLib']);
-            (0, assert_1.default)(importResult.isImportFound);
-            (0, assert_1.default)(importResult.isStubFile);
-            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
+            const sp = createServiceProviderFromFiles(files);
+            const configOptions = new configOptions_1.ConfigOptions(uriUtils_1.UriEx.file('/'));
+            const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(libraryRoot)]));
+            // Stub package wins over original package (per PEP 561 rules).
+            const myUri = uriUtils_1.UriEx.file(myFile);
+            const sideBySideResult = importResolver.resolveImport(myUri, configOptions.findExecEnvironment(myUri), {
+                leadingDots: 0,
+                nameParts: ['myLib', 'partialStub'],
+                importedSymbols: new Set(),
+            });
+            (0, assert_1.default)(sideBySideResult.isImportFound);
+            (0, assert_1.default)(sideBySideResult.isStubFile);
+            const sideBySideStubFile = uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi'));
+            assert_1.default.strictEqual(1, sideBySideResult.resolvedUris.filter((f) => f.key === sideBySideStubFile.key).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(myUri, configOptions.findExecEnvironment(myUri), {
+                leadingDots: 0,
+                nameParts: ['myLib', 'partialStub2'],
+                importedSymbols: new Set(),
+            });
+            (0, assert_1.default)(partialStubResult.isImportFound);
+            (0, assert_1.default)(partialStubResult.isStubFile);
+            const partialStubFile = uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub2.pyi'));
+            assert_1.default.strictEqual(1, partialStubResult.resolvedUris.filter((f) => f.key === partialStubFile.key).length);
         });
-        test('stub package', () => {
+        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-stubs', '__init__.pyi'),
-                    content: '# empty',
-                },
                 {
                     path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py'),
                     content: 'def test(): pass',
@@ -85,31 +321,37 @@ if (!usingTrueVenv()) {
             ];
             // 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.isImportFound);
+            (0, assert_1.default)(!importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py')).length);
         });
-        test('partial stub package in typing folder', () => {
+        test('py.typed namespace package plus stubs', () => {
             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/core', 'foo.pyi'),
+                    content: 'def test(): pass',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib-stubs', 'py.typed'),
-                    content: 'partial\n',
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
+                    content: '',
                 },
                 {
                     path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
                     content: 'def test(): pass',
                 },
+                {
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi'),
+                    content: 'def test(): pass',
+                },
             ];
             const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = uriUtils_1.UriEx.file(typingFolder)));
             (0, assert_1.default)(importResult.isImportFound);
             (0, assert_1.default)(importResult.isStubFile);
-            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
+            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
         });
-        test('typeshed folder', () => {
-            const typeshedFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'ts');
+        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'),
@@ -120,7 +362,7 @@ if (!usingTrueVenv()) {
                     content: 'partial\n',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(typeshedFolder, 'stubs', 'myLibPackage', 'myLib.pyi'),
+                    path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib.pyi'),
                     content: '# empty',
                 },
                 {
@@ -128,561 +370,329 @@ if (!usingTrueVenv()) {
                     content: 'def test(): pass',
                 },
             ];
-            // Stub packages win over typeshed.
-            const importResult = getImportResult(files, ['myLib'], (c) => (c.typeshedPath = uriUtils_1.UriEx.file(typeshedFolder)));
+            // If the package exists in typing folder, that gets picked up first.
+            const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = uriUtils_1.UriEx.file(typingFolder)));
             (0, assert_1.default)(importResult.isImportFound);
             (0, assert_1.default)(importResult.isStubFile);
-            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
+            assert_1.default.strictEqual(0, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
         });
-        test('typeshed fallback folder', () => {
+        test('non py.typed library', () => {
             const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
+                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'os', '__init__.py'),
                     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', '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.resolvedUris[importResult.resolvedUris.length - 1].getFilePath());
+        });
+        test('no empty import roots', () => {
+            const sp = createServiceProviderFromFiles([]);
+            const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty()); // Empty, like open-file mode.
+            const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(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', 'myLibPackage', 'myLib.pyi'),
+                    path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib', 'aLib', '__init__.pyi'),
                     content: '# empty',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-                    content: 'def test(): pass',
+                    path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'bLib', 'bLib', '__init__.pyi'),
+                    content: '# empty',
                 },
             ];
-            // 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.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
+            const sp = createServiceProviderFromFiles(files);
+            const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty()); // Empty, like open-file mode.
+            const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(libraryRoot)]));
+            const importRoots = importResolver.getImportRoots(configOptions.getDefaultExecEnvironment());
+            assert_1.default.strictEqual(1, importRoots.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib')).length);
+            assert_1.default.strictEqual(1, importRoots.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'bLib')).length);
         });
-        test('py.typed file', () => {
+        test('import side by side file root', () => {
             const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', '__init__.pyi'),
-                    content: 'def test(): ...',
+                    path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
+                    content: 'def test1(): ...',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'py.typed'),
-                    content: 'partial\n',
+                    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.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)('/', 'file1.py')).length);
+        });
+        test('import side by side file sub folder', () => {
+            const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-                    content: 'def test(): pass',
+                    path: (0, pathUtils_1.combinePaths)('/test', 'file1.py'),
+                    content: 'def test1(): ...',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
-                    content: '# typed',
+                    path: (0, pathUtils_1.combinePaths)('/test', 'file2.py'),
+                    content: 'def test2(): ...',
                 },
             ];
-            // Partial stub package always overrides original package.
-            const importResult = getImportResult(files, ['myLib']);
+            const importResult = getImportResult(files, ['file1']);
             (0, assert_1.default)(importResult.isImportFound);
-            (0, assert_1.default)(importResult.isStubFile);
+            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)('/test', 'file1.py')).length);
         });
-        test('py.typed library', () => {
+        test('import side by side file sub under src folder', () => {
             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)('/src/nested', 'file1.py'),
+                    content: 'def test1(): ...',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'os', 'os', '__init__.pyi'),
-                    content: '# empty',
+                    path: (0, pathUtils_1.combinePaths)('/src/nested', 'file2.py'),
+                    content: 'def test2(): ...',
                 },
             ];
-            const importResult = getImportResult(files, ['os']);
+            const importResult = getImportResult(files, ['file1']);
             (0, assert_1.default)(importResult.isImportFound);
-            assert_1.default.strictEqual(files[0].path, importResult.resolvedUris[importResult.resolvedUris.length - 1].getFilePath());
+            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'))
+                .length);
         });
-        test('import side by side file sub under lib folder', () => {
+        test('import file sub under containing folder', () => {
             const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)('/lib/site-packages/myLib', 'file1.py'),
+                    path: (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'),
                     content: 'def test1(): ...',
                 },
                 {
-                    path: (0, pathUtils_1.combinePaths)('/lib/site-packages/myLib', 'file2.py'),
+                    path: (0, pathUtils_1.combinePaths)('/src/nested/nested2', 'file2.py'),
                     content: 'def test2(): ...',
                 },
             ];
             const importResult = getImportResult(files, ['file1']);
-            (0, assert_1.default)(!importResult.isImportFound);
-        });
-    });
-    test('getModuleNameForImport library file', () => {
-        const files = [
-            {
-                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'myModule', 'file1.py'),
-                content: '# empty',
-            },
-        ];
-        const moduleImportInfo = getModuleNameForImport(files);
-        assert_1.default.strictEqual(moduleImportInfo.importType, 1 /* ImportType.ThirdParty */);
-        (0, assert_1.default)(!moduleImportInfo.isThirdPartyPyTypedPresent);
-        (0, assert_1.default)(!moduleImportInfo.isLocalTypingsFile);
-    });
-    test('getModuleNameForImport py.typed library file', () => {
-        const files = [
-            {
-                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
-                content: '',
-            },
-            {
-                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'myModule', 'file1.py'),
-                content: '# empty',
-            },
-        ];
-        const moduleImportInfo = getModuleNameForImport(files);
-        assert_1.default.strictEqual(moduleImportInfo.importType, 1 /* ImportType.ThirdParty */);
-        (0, assert_1.default)(moduleImportInfo.isThirdPartyPyTypedPresent);
-        (0, assert_1.default)(!moduleImportInfo.isLocalTypingsFile);
-    });
-}
-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(uriUtils_1.UriEx.file('/'));
-        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(libraryRoot)]));
-        // Stub package wins over original package (per PEP 561 rules).
-        const myUri = uriUtils_1.UriEx.file(myFile);
-        const sideBySideResult = importResolver.resolveImport(myUri, configOptions.findExecEnvironment(myUri), {
-            leadingDots: 0,
-            nameParts: ['myLib', 'partialStub'],
-            importedSymbols: new Set(),
+            (0, assert_1.default)(importResult.isImportFound);
+            assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)('/src/nested', 'file1.py'))
+                .length);
         });
-        (0, assert_1.default)(sideBySideResult.isImportFound);
-        (0, assert_1.default)(sideBySideResult.isStubFile);
-        const sideBySideStubFile = uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.pyi'));
-        assert_1.default.strictEqual(1, sideBySideResult.resolvedUris.filter((f) => f.key === sideBySideStubFile.key).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(myUri, configOptions.findExecEnvironment(myUri), {
-            leadingDots: 0,
-            nameParts: ['myLib', 'partialStub2'],
-            importedSymbols: new Set(),
+        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 = uri_1.Uri.empty()));
+            (0, assert_1.default)(!importResult.isImportFound);
         });
-        (0, assert_1.default)(partialStubResult.isImportFound);
-        (0, assert_1.default)(partialStubResult.isStubFile);
-        const partialStubFile = uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub2.pyi'));
-        assert_1.default.strictEqual(1, partialStubResult.resolvedUris.filter((f) => f.key === partialStubFile.key).length);
-    });
-    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.resolvedUris.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'partialStub.py')).length);
-    });
-    test('py.typed namespace package plus stubs', () => {
-        const typingFolder = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'typing');
-        const files = [
-            {
-                path: (0, pathUtils_1.combinePaths)(typingFolder, 'myLib/core', 'foo.pyi'),
-                content: 'def test(): pass',
-            },
-            {
-                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', 'py.typed'),
-                content: '',
-            },
-            {
-                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.py'),
-                content: 'def test(): pass',
-            },
-            {
-                path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi'),
-                content: 'def test(): pass',
-            },
-        ];
-        const importResult = getImportResult(files, ['myLib'], (c) => (c.stubPath = uriUtils_1.UriEx.file(typingFolder)));
-        (0, assert_1.default)(importResult.isImportFound);
-        (0, assert_1.default)(importResult.isStubFile);
-        assert_1.default.strictEqual(1, importResult.resolvedUris.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).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 = uriUtils_1.UriEx.file(typingFolder)));
-        (0, assert_1.default)(importResult.isImportFound);
-        (0, assert_1.default)(importResult.isStubFile);
-        assert_1.default.strictEqual(0, importResult.resolvedUris.filter((f) => f.getFilePath() === (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib', '__init__.pyi')).length);
-    });
-    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.resolvedUris[importResult.resolvedUris.length - 1].getFilePath());
-    });
-    test('no empty import roots', () => {
-        const sp = createServiceProviderFromFiles([]);
-        const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty()); // Empty, like open-file mode.
-        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(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(uri_1.Uri.empty()); // Empty, like open-file mode.
-        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(libraryRoot)]));
-        const importRoots = importResolver.getImportRoots(configOptions.getDefaultExecEnvironment());
-        assert_1.default.strictEqual(1, importRoots.filter((f) => !f.isEmpty() && f.getFilePath() === (0, pathUtils_1.combinePaths)('/', pathConsts_1.typeshedFallback, 'stubs', 'aLib')).length);
-        assert_1.default.strictEqual(1, importRoots.filter((f) => !f.isEmpty() && f.getFilePath() === (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.resolvedUris.filter((f) => f.getFilePath() === (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.resolvedUris.filter((f) => f.getFilePath() === (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.resolvedUris.filter((f) => f.getFilePath() === (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.resolvedUris.filter((f) => f.getFilePath() === (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 = uri_1.Uri.empty()));
-        (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 = [
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+        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 = [
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+                ];
+            });
+            (0, assert_1.default)(importResult.isImportFound);
         });
-        (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 = [
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+        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 = [
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+                ];
+            });
+            (0, assert_1.default)(importResult.isImportFound);
         });
-        (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 = [
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+        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 = [
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+                ];
+            });
+            (0, assert_1.default)(!importResult.isImportFound);
         });
-        (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 = [
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
-                uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+        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 = [
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages1')),
+                    uriUtils_1.UriEx.file((0, pathUtils_1.combinePaths)('/', 'packages2')),
+                ];
+            });
+            (0, assert_1.default)(!importResult.isImportFound);
         });
-        (0, assert_1.default)(!importResult.isImportFound);
-    });
-    test('default workspace importing side by side file', () => {
-        const files = [
-            {
-                path: (0, pathUtils_1.combinePaths)('/', 'src', 'a', 'b', 'file1.py'),
-                content: 'import file2',
-            },
-            {
-                path: (0, pathUtils_1.combinePaths)('/', 'src', 'a', 'b', 'file2.py'),
-                content: 'def f(): pass',
-            },
-        ];
-        const importResult = getImportResult(files, ['file2'], (config) => {
-            config.projectRoot = uri_1.Uri.defaultWorkspace({ isCaseSensitive: () => true });
+        test('default workspace importing side by side file', () => {
+            const files = [
+                {
+                    path: (0, pathUtils_1.combinePaths)('/', 'src', 'a', 'b', 'file1.py'),
+                    content: 'import file2',
+                },
+                {
+                    path: (0, pathUtils_1.combinePaths)('/', 'src', 'a', 'b', 'file2.py'),
+                    content: 'def f(): pass',
+                },
+            ];
+            const importResult = getImportResult(files, ['file2'], (config) => {
+                config.projectRoot = uri_1.Uri.defaultWorkspace({ isCaseSensitive: () => true });
+            });
+            (0, assert_1.default)(importResult.isImportFound);
         });
-        (0, assert_1.default)(importResult.isImportFound);
-    });
-    test('getModuleNameForImport user file', () => {
-        const files = [
-            {
-                path: (0, pathUtils_1.combinePaths)('/', 'src', 'file1.py'),
-                content: '# empty',
-            },
-        ];
-        const moduleImportInfo = getModuleNameForImport(files);
-        assert_1.default.strictEqual(moduleImportInfo.importType, 2 /* ImportType.Local */);
-        (0, assert_1.default)(!moduleImportInfo.isThirdPartyPyTypedPresent);
-        (0, assert_1.default)(!moduleImportInfo.isLocalTypingsFile);
-    });
-});
-if (usingTrueVenv()) {
-    describe('Import tests that have to run with a venv', () => {
-        test('venv can find imports', () => {
+        test('getModuleNameForImport user file', () => {
             const files = [
                 {
-                    path: (0, pathUtils_1.combinePaths)('/', 'file1.py'),
-                    content: 'import pytest',
+                    path: (0, pathUtils_1.combinePaths)('/', 'src', 'file1.py'),
+                    content: '# empty',
                 },
             ];
-            const importResult = getImportResult(files, ['pytest']);
-            (0, assert_1.default)(importResult.isImportFound, `Import not found: ${importResult.importFailureInfo?.join('\n')}`);
+            const moduleImportInfo = getModuleNameForImport(files);
+            assert_1.default.strictEqual(moduleImportInfo.importType, 2 /* ImportType.Local */);
+            (0, assert_1.default)(!moduleImportInfo.isThirdPartyPyTypedPresent);
+            (0, assert_1.default)(!moduleImportInfo.isLocalTypingsFile);
         });
     });
-}
-function getImportResult(files, nameParts, setup) {
-    const { importResolver, uri, configOptions } = setupImportResolver(files, setup);
-    const importResult = importResolver.resolveImport(uri, configOptions.findExecEnvironment(uri), {
-        leadingDots: 0,
-        nameParts: nameParts,
-        importedSymbols: new Set(),
-    });
-    // Add the config venvpath to the import result so we can output it on failure.
-    if (!importResult.isImportFound) {
-        importResult.importFailureInfo = importResult.importFailureInfo ?? [];
-        importResult.importFailureInfo.push(`venvPath: ${configOptions.venvPath}`);
+    if (usingTrueVenv()) {
+        describe('Import tests that have to run with a venv', () => {
+            test('venv can find imports', () => {
+                const tempFile = new realFileSystem_1.RealTempFile();
+                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: ${importResult.importFailureInfo?.join('\n')}`);
+                tempFile.dispose();
+            });
+        });
     }
-    return importResult;
-}
-function getModuleNameForImport(files, setup) {
-    const { importResolver, uri, configOptions } = setupImportResolver(files, setup);
-    const moduleImportInfo = importResolver.getModuleNameForImport(uri, configOptions.findExecEnvironment(uri), undefined, 
-    /* detectPyTyped */ true);
-    return moduleImportInfo;
-}
-function setupImportResolver(files, setup) {
-    const defaultHostFactory = (sp) => new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(libraryRoot)]);
-    const defaultSetup = setup ??
-        ((c) => {
-            /* empty */
+    function getImportResult(files, nameParts, setup) {
+        const { importResolver, uri, configOptions } = setupImportResolver(files, setup);
+        const importResult = importResolver.resolveImport(uri, configOptions.findExecEnvironment(uri), {
+            leadingDots: 0,
+            nameParts: nameParts,
+            importedSymbols: new Set(),
         });
-    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 = uriUtils_1.UriEx.file(process.env.CI_IMPORT_TEST_VENVPATH, 
-            /* isCaseSensitive */ true, 
-            /* checkRelative */ true);
-            c.venv = process.env.CI_IMPORT_TEST_VENV;
-        };
-        spFactory = (files) => createServiceProviderWithCombinedFs(files);
+        // Add the config venvpath to the import result so we can output it on failure.
+        if (!importResult.isImportFound) {
+            importResult.importFailureInfo = importResult.importFailureInfo ?? [];
+            importResult.importFailureInfo.push(`venvPath: ${configOptions.venvPath}`);
+        }
+        return importResult;
     }
-    else if (process.env.CI_IMPORT_TEST_PYTHONPATH) {
-        configModifier = (c) => {
-            defaultSetup(c);
-            c.pythonPath = uriUtils_1.UriEx.file(process.env.CI_IMPORT_TEST_PYTHONPATH, 
-            /* isCaseSensitive */ true, 
-            /* checkRelative */ true);
-        };
-        hostFactory = (sp) => new TruePythonTestAccessHost(sp);
-        spFactory = (files) => createServiceProviderWithCombinedFs(files);
+    function getModuleNameForImport(files, setup) {
+        const { importResolver, uri, configOptions } = setupImportResolver(files, setup);
+        const moduleImportInfo = importResolver.getModuleNameForImport(uri, configOptions.findExecEnvironment(uri), undefined, 
+        /* detectPyTyped */ true);
+        return moduleImportInfo;
     }
-    const sp = spFactory(files);
-    const configOptions = new configOptions_1.ConfigOptions(uriUtils_1.UriEx.file('/'));
-    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({
-            path: file,
-            content: '# not used',
-        });
+    function setupImportResolver(files, setup) {
+        const defaultHostFactory = (sp) => new testAccessHost_1.TestAccessHost(sp.fs().getModulePath(), [uriUtils_1.UriEx.file(libraryRoot)]);
+        const defaultSetup = 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 = uriUtils_1.UriEx.file(process.env.CI_IMPORT_TEST_VENVPATH, 
+                /* isCaseSensitive */ true, 
+                /* checkRelative */ true);
+                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 = uriUtils_1.UriEx.file(process.env.CI_IMPORT_TEST_PYTHONPATH, 
+                /* isCaseSensitive */ true, 
+                /* checkRelative */ true);
+            };
+            hostFactory = (sp) => {
+                return new TruePythonTestAccessHost(sp, tempFile);
+            };
+            spFactory = (files) => createServiceProviderWithCombinedFs(files);
+        }
+        const sp = spFactory(files);
+        const configOptions = new configOptions_1.ConfigOptions(uriUtils_1.UriEx.file('/'));
+        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({
+                path: file,
+                content: '# not used',
+            });
+        }
+        const uri = uriUtils_1.UriEx.file(file);
+        const importResolver = new importResolver_1.ImportResolver(sp, configOptions, hostFactory(sp));
+        return { importResolver, uri, configOptions };
     }
-    const uri = uriUtils_1.UriEx.file(file);
-    const importResolver = new importResolver_1.ImportResolver(sp, configOptions, hostFactory(sp));
-    return { importResolver, uri, configOptions };
-}
+});
 function createTestFileSystem(files) {
     const fs = new filesystem_1.TestFileSystem(/* ignoreCase */ false, { cwd: (0, pathUtils_1.normalizeSlashes)('/') });
     for (const file of files) {
@@ -704,11 +714,11 @@ function createServiceProviderWithCombinedFs(files) {
     return (0, serviceProviderExtensions_1.createServiceProvider)(testFS, fs);
 }
 class TruePythonTestAccessHost extends fullAccessHost_1.FullAccessHost {
-    constructor(sp) {
-        // Make sure the service provide in use is using a real file system and real temporary file provider.
+    constructor(sp, tempFile) {
         const clone = sp.clone();
-        clone.add(serviceKeys_1.ServiceKeys.fs, (0, realFileSystem_1.createFromRealFileSystem)(sp.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector)));
-        clone.add(serviceKeys_1.ServiceKeys.tempFile, new realFileSystem_1.RealTempFile());
+        // Make sure the service provide in use is using a real file system and real temporary file provider.
+        clone.add(serviceKeys_1.ServiceKeys.tempFile, tempFile);
+        clone.add(serviceKeys_1.ServiceKeys.fs, (0, realFileSystem_1.createFromRealFileSystem)(tempFile));
         super(clone);
     }
 }