Fix daemon crash when deleting packages (#10036)

Fixes #10035.

Author: JukkaL

mypy/server/update.py

@@ -1172,7 +1172,11 @@ def refresh_suppressed_submodules(
         return None
     # Find any submodules present in the directory.
     pkgdir = os.path.dirname(path)
-    for fnam in fscache.listdir(pkgdir):
+    try:
+        entries = fscache.listdir(pkgdir)
+    except FileNotFoundError:
+        entries = []
+    for fnam in entries:
         if (not fnam.endswith(('.py', '.pyi'))
                 or fnam.startswith("__init__.")
                 or fnam.count('.') != 1):

mypy/test/data.py

@@ -95,7 +95,7 @@ def parse_test_case(case: 'DataDrivenTestCase') -> None:
             reprocessed = [] if item.arg is None else [t.strip() for t in item.arg.split(',')]
             targets[passnum] = reprocessed
         elif item.id == 'delete':
-            # File to delete during a multi-step test case
+            # File/directory to delete during a multi-step test case
             assert item.arg is not None
             m = re.match(r'(.*)\.([0-9]+)$', item.arg)
             assert m, 'Invalid delete section: {}'.format(item.arg)

mypy/test/testcheck.py

@@ -2,6 +2,7 @@
 
 import os
 import re
+import shutil
 import sys
 
 from typing import Dict, List, Set, Tuple
@@ -158,9 +159,13 @@ def run_case_once(self, testcase: DataDrivenTestCase,
                     # Modify/create file
                     copy_and_fudge_mtime(op.source_path, op.target_path)
                 else:
-                    # Delete file
-                    # Use retries to work around potential flakiness on Windows (AppVeyor).
+                    # Delete file/directory
                     path = op.path
+                    if os.path.isdir(path):
+                        # Sanity check to avoid unexpected deletions
+                        assert path.startswith('tmp')
+                        shutil.rmtree(path)
+                    # Use retries to work around potential flakiness on Windows (AppVeyor).
                     retry_on_error(lambda: os.remove(path))
 
         # Parse options after moving files (in case mypy.ini is being moved).

mypy/test/testfinegrained.py

@@ -14,6 +14,7 @@
 
 import os
 import re
+import shutil
 
 from typing import List, Dict, Any, Tuple, Union, cast
 
@@ -215,8 +216,13 @@ def perform_step(self,
                 # Modify/create file
                 copy_and_fudge_mtime(op.source_path, op.target_path)
             else:
-                # Delete file
-                os.remove(op.path)
+                # Delete file/directory
+                if os.path.isdir(op.path):
+                    # Sanity check to avoid unexpected deletions
+                    assert op.path.startswith('tmp')
+                    shutil.rmtree(op.path)
+                else:
+                    os.remove(op.path)
         sources = self.parse_sources(main_src, step, options)
 
         if step <= num_regular_incremental_steps:

test-data/unit/fine-grained-follow-imports.test

@@ -739,3 +739,34 @@ from . import mod2
 main.py:1: error: Cannot find implementation or library stub for module named "pkg"
 main.py:1: note: See https://mypy.readthedocs.io/en/latest/running_mypy.html#missing-imports
 ==
+
+[case testFollowImportsNormalDeletePackage]
+# flags: --follow-imports=normal
+# cmd: mypy main.py
+
+[file main.py]
+import pkg
+
+[file pkg/__init__.py]
+from . import mod
+
+[file pkg/mod.py]
+from . import mod2
+import pkg2
+
+[file pkg/mod2.py]
+from . import mod2
+import pkg2
+
+[file pkg2/__init__.py]
+from . import mod3
+
+[file pkg2/mod3.py]
+
+[delete pkg/.2]
+[delete pkg2/.2]
+
+[out]
+==
+main.py:1: error: Cannot find implementation or library stub for module named "pkg"
+main.py:1: note: See https://mypy.readthedocs.io/en/latest/running_mypy.html#missing-imports