Simplify mypyc test

Author: p-sawicki

mypyc/test-data/run-multimodule.test

@@ -1246,6 +1246,39 @@ import native
 
 [rechecked other_a]
 
+-- Test that importing a skipped module does not force rechecks.
+[case testIncrementalCompilationFollowImportsSkip]
+from other_dep import f
+assert f() == 1
+
+[file other_dep.py]
+import skipped
+
+def f() -> int:
+    return 1
+
+def g() -> int:
+    return 2
+
+# Files under "skipped" are not typechecked because of the "--follow_imports = skip" option.
+[file skipped/__init__.py]
+x = 1
+
+[file skipped/other_child.py]
+import skipped
+
+def child() -> int:
+    return 1
+
+[file native.py.2]
+from other_dep import g
+assert g() == 2
+
+[file driver.py]
+import native
+
+[rechecked native]
+
 [case testSeparateCompilationWithUndefinedAttribute]
 from other_a import A
 

mypyc/test/test_misc.py

@@ -3,9 +3,7 @@
 import os
 import tempfile
 import unittest
-from unittest.mock import patch
 
-import mypyc.build as mypyc_build_module
 from mypyc.build import get_header_deps, resolve_cfile_deps
 from mypyc.ir.ops import BasicBlock
 from mypyc.ir.pprint import format_blocks, generate_names_for_ir
@@ -27,68 +25,6 @@ def test_debug_op(self) -> None:
         assert code[:-1] == ["L0:", "    r0 = 'foo'", "    CPyDebug_PrintObject(r0)"]
 
 
-class TestIncrementalOutputFiles(unittest.TestCase):
-    def test_cached_dependency_output_file_not_overwritten_for_preserved_suppression(self) -> None:
-        with tempfile.TemporaryDirectory() as tmp:
-            build_dir = os.path.join(tmp, "build")
-            with open(os.path.join(tmp, "mypy.ini"), "w", encoding="utf-8") as f:
-                f.write("[mypy]\nfollow_imports = skip\n")
-            os.mkdir(os.path.join(tmp, "skipped"))
-            with open(os.path.join(tmp, "skipped", "__init__.py"), "w", encoding="utf-8") as f:
-                f.write("x = 1\n")
-            with open(os.path.join(tmp, "skipped", "child.py"), "w", encoding="utf-8") as f:
-                f.write("import skipped\n\ndef child() -> int:\n    return 1\n")
-            with open(os.path.join(tmp, "dep.py"), "w", encoding="utf-8") as f:
-                f.write("import skipped\n\ndef value() -> int:\n    return 1\n")
-            with open(os.path.join(tmp, "main.py"), "w", encoding="utf-8") as f:
-                f.write("import dep\n\ndef value() -> int:\n    return dep.value()\n")
-
-            compiler_options = CompilerOptions(separate=True, target_dir=build_dir)
-
-            old_cwd = os.getcwd()
-            os.chdir(tmp)
-            try:
-                files = ["dep.py", "skipped/child.py", "main.py"]
-
-                groups, group_cfilenames, _ = mypyc_build_module.mypyc_build(
-                    files, compiler_options, separate=True
-                )
-
-                dep_group = next(
-                    i
-                    for i, (group_sources, _) in enumerate(groups)
-                    if [source.module for source in group_sources] == ["dep"]
-                )
-                dep_output_files = {
-                    os.path.abspath(path)
-                    for paths in group_cfilenames[dep_group]
-                    for path in paths
-                }
-
-                # Only main changed; dep should be loaded from the mypyc IR cache and reuse
-                # its existing C outputs.
-                with open("main.py", "w", encoding="utf-8") as f:
-                    f.write("import dep\n\ndef value() -> int:\n    return dep.value() + 1\n")
-
-                written_paths: set[str] = set()
-                original_write_file = mypyc_build_module.write_file
-
-                def recording_write_file(path: str, contents: str) -> None:
-                    written_paths.add(os.path.abspath(path))
-                    original_write_file(path, contents)
-
-                with patch.object(
-                    mypyc_build_module, "write_file", side_effect=recording_write_file
-                ):
-                    # skipped.child imports its skipped package ancestor; loading that cached
-                    # state should not make cached dep stale or rewrite dep's generated outputs.
-                    mypyc_build_module.mypyc_build(files, compiler_options, separate=True)
-            finally:
-                os.chdir(old_cwd)
-
-            assert written_paths.isdisjoint(dep_output_files)
-
-
 class TestHeaderDeps(unittest.TestCase):
     """
     Tests for the header-dependency tracking used to build `Extension.depends`, which drives

mypyc/test/test_run.py

@@ -234,6 +234,10 @@ def run_case_step(self, testcase: DataDrivenTestCase, incremental_step: int) ->
         # Avoid checking modules/packages named 'unchecked', to provide a way
         # to test interacting with code we don't have types for.
         options.per_module_options["unchecked.*"] = {"follow_imports": "error"}
+        # Avoid checking modules/packages named 'skipped', to provide a way
+        # to test interacting with code ignored by follow_imports=skip.
+        options.per_module_options["skipped"] = {"follow_imports": "skip"}
+        options.per_module_options["skipped.*"] = {"follow_imports": "skip"}
 
         source = build.BuildSource("native.py", "native", None)
         sources = [source]