more test fixes related to permissions

Author: nllong

geojson_modelica_translator/modelica/modelica_runner.py

@@ -84,12 +84,8 @@ def _docker_post_run_permissions_command(self) -> str:
         """Return shell commands that make Docker-created outputs editable by the host user."""
         return (
             'if [[ -n "${HOST_UID:-}" && -n "${HOST_GID:-}" ]]; then '
-            'for output_dir in "$PWD"/*_results; do '
-            'if [[ -e "$output_dir" ]]; then '
-            'chown -R "$HOST_UID:$HOST_GID" "$output_dir" 2>/dev/null || true ; '
-            'chmod -R u+rwX "$output_dir" 2>/dev/null || true ; '
-            "fi ; "
-            "done ; "
+            'chown -R "$HOST_UID:$HOST_GID" "$PWD" 2>/dev/null || true ; '
+            'chmod -R u+rwX "$PWD" 2>/dev/null || true ; '
             "fi"
         )
 

tests/modelica/test_modelica_runner.py

@@ -87,9 +87,8 @@ def test_docker_command_restores_permissions_after_failed_omc(self):
         assert exec_call[exec_call.index("-w") + 1] == f"/mnt/shared/{Path(self.run_path).name}"
         assert exec_call[-4:] == ["--", "simulate", "flag1", "flag2"]
         assert 'omc "$1.mos" "${@:2}" ; ret=$? ;' in script
-        assert 'for output_dir in "$PWD"/*_results; do' in script
-        assert 'chown -R "$HOST_UID:$HOST_GID" "$output_dir"' in script
-        assert 'chmod -R u+rwX "$output_dir"' in script
+        assert 'chown -R "$HOST_UID:$HOST_GID" "$PWD"' in script
+        assert 'chmod -R u+rwX "$PWD"' in script
         assert 'chmod -R a+rwX "$PWD"' not in script
         assert len(run_calls) == 1
 
@@ -124,8 +123,8 @@ def test_docker_interrupt_restores_permissions_before_exiting(self):
         cleanup_script = cleanup_call[cleanup_call.index("-c") + 1]
         assert "--rm" in cleanup_call
         assert cleanup_call[cleanup_call.index("-w") + 1] == f"/mnt/shared/{Path(self.run_path).name}"
-        assert 'for output_dir in "$PWD"/*_results; do' in cleanup_script
-        assert 'chown -R "$HOST_UID:$HOST_GID" "$output_dir"' in cleanup_script
+        assert 'chown -R "$HOST_UID:$HOST_GID" "$PWD"' in cleanup_script
+        assert 'chmod -R u+rwX "$PWD"' in cleanup_script
 
     @pytest.mark.compilation
     def test_compile_bouncing_ball_in_docker(self):