Tweak module unloading in case of import error

mesonbuild · lesteve · Feb 22, 2024 · Feb 22, 2024 · Feb 23, 2024 · Feb 23, 2024
commit ee8048eba9489d0d4815f5df18202f1048f76d0f
diff --git a/tests/test_editable.py b/tests/test_editable.py
@@ -105,9 +105,9 @@ def test_mesonpy_meta_finder(package_complex, tmp_path, make_finder):
     finally:
         # remove finder from the meta path
         del sys.meta_path[0]
-        # unload complex module and all its submodules
+        # unload complex module and all its submodules to be able to run parametrized tests without side-effects
         for module in ['complex', 'complex.test', 'complex.namespace', 'complex.namespace.foo']:
-            del sys.modules[module]
+            sys.modules.pop(module, None)
 
 
 def test_mesonpy_traversable():

diff --git a/mesonpy/_editable.py b/mesonpy/_editable.py
            if not ninja_index_and_arg_list:
                dry_run_build_cmd = self._build_cmd + ['--ninja-args=-n']
            else:
                dry_run_build_cmd = self._build_cmd.copy()
                # Last --ninja-args overrides all the previous ones, so need to modify only the last one to add -n
                last_ninja_index, last_ninja_args = ninja_index_and_arg_list[-1]
                dry_run_build_cmd[last_ninja_index] = last_ninja_args + ',-n'

        p = subprocess.run(dry_run_build_cmd, cwd=self._build_path, env=env, capture_output=True, check=True)
        return b'ninja: no work to do.' not in p.stdout and b'samu: nothing to do' not in p.stdout
	if not ninja_index_and_arg_list:
	dry_run_build_cmd = self._build_cmd + ['--ninja-args=-n']
	else:
	dry_run_build_cmd = self._build_cmd.copy()
Check warning on line 323 in mesonpy/_editable.py Codecov / codecov/patch mesonpy/_editable.py#L323 `Added line #L323 was not covered by tests`
	# Last --ninja-args overrides all the previous ones, so need to modify only the last one to add -n
	last_ninja_index, last_ninja_args = ninja_index_and_arg_list[-1]
	dry_run_build_cmd[last_ninja_index] = last_ninja_args + ',-n'
Check warning on line 326 in mesonpy/_editable.py Codecov / codecov/patch mesonpy/_editable.py#L325-L326 `Added lines #L325 - L326 were not covered by tests`

	p = subprocess.run(dry_run_build_cmd, cwd=self._build_path, env=env, capture_output=True, check=True)
	return b'ninja: no work to do.' not in p.stdout and b'samu: nothing to do' not in p.stdout