delete last remains of writable_files

Author: prandla

cms/grading/steps/evaluation.py

@@ -86,7 +86,6 @@ def evaluation_step(
     time_limit: float | None = None,
     memory_limit: int | None = None,
     dirs_map: dict[str, tuple[str | None, str | None]] | None = None,
-    writable_files: list[str] | None = None,
     stdin_redirect: str | None = None,
     stdout_redirect: str | None = None,
     multiprocess: bool = False,
@@ -109,11 +108,6 @@ def evaluation_step(
         from external directories to a pair of strings: the first is the path
         they should be mapped to inside the sandbox, the second, is
         isolate's options for the mapping.
-    writable_files: a list of inner file names (relative to
-        the inner path) on which the command is allow to write, or None to
-        indicate that all files are read-only; if applicable, redirected
-        output and the standard error are implicitly added to the files
-        allowed.
     stdin_redirect: the name of the file that will be redirected
         to the standard input of each command; if None, nothing will be
         provided to stdin.
@@ -136,7 +130,7 @@ def evaluation_step(
     for command in commands:
         success = evaluation_step_before_run(
             sandbox, command, time_limit, memory_limit,
-            dirs_map, writable_files, stdin_redirect, stdout_redirect,
+            dirs_map, stdin_redirect, stdout_redirect,
             multiprocess, wait=True)
         if not success:
             logger.debug("Job failed in evaluation_step_before_run.")
@@ -155,7 +149,6 @@ def evaluation_step_before_run(
     time_limit: float | None = None,
     memory_limit: int | None = None,
     dirs_map: dict[str, tuple[str | None, str | None]] | None = None,
-    writable_files: list[str] | None = None,
     stdin_redirect: str | None = None,
     stdout_redirect: str | None = None,
     multiprocess: bool = False,
@@ -182,8 +175,6 @@ def evaluation_step_before_run(
     # Default parameters handling.
     if dirs_map is None:
         dirs_map = {}
-    if writable_files is None:
-        writable_files = []
     if stdout_redirect is None:
         stdout_redirect = "stdout.txt"
 
@@ -209,9 +200,6 @@ def evaluation_step_before_run(
 
     for src, (dest, options) in dirs_map.items():
         sandbox.add_mapped_directory(src, dest=dest, options=options)
-    for name in [sandbox.stderr_file, sandbox.stdout_file]:
-        if name is not None:
-            writable_files.append(name)
 
     sandbox.set_multiprocess(multiprocess)
 

cms/grading/tasktypes/Batch.py

@@ -284,18 +284,13 @@ def _execution_step(self, job: EvaluationJob, file_cacher: FileCacher):
             self._actual_input: job.input
         }
 
-        # Check which redirect we need to perform, and in case we don't
-        # manage the output via redirect, the submission needs to be able
-        # to write on it.
-        files_allowing_write = []
+        # Check which redirect we need to perform
         stdin_redirect = None
         stdout_redirect = None
         if len(self.input_filename) == 0:
             stdin_redirect = self._actual_input
         if len(self.output_filename) == 0:
             stdout_redirect = self._actual_output
-        else:
-            files_allowing_write.append(self._actual_output)
 
         # Create the sandbox
         sandbox = create_sandbox(0, file_cacher, name="evaluate")
@@ -313,7 +308,6 @@ def _execution_step(self, job: EvaluationJob, file_cacher: FileCacher):
             commands,
             job.time_limit,
             job.memory_limit,
-            writable_files=files_allowing_write,
             stdin_redirect=stdin_redirect,
             stdout_redirect=stdout_redirect,
             multiprocess=job.multithreaded_sandbox)

cms/grading/tasktypes/Communication.py

@@ -327,7 +327,6 @@ def evaluate(self, job: EvaluationJob, file_cacher: FileCacher):
             manager_time_limit,
             config.sandbox.trusted_sandbox_max_memory_kib * 1024,
             dirs_map=dict((fifo_dir[i], (sandbox_fifo_dir[i], "rw")) for i in indices),
-            writable_files=[self.OUTPUT_FILENAME],
             stdin_redirect=self.INPUT_FILENAME,
             multiprocess=job.multithreaded_sandbox,
         )

cmstestsuite/unit_tests/grading/tasktypes/BatchTest.py

@@ -355,7 +355,6 @@ def test_stdio_diff_success(self):
             sandbox,
             fake_evaluation_commands(EVALUATION_COMMAND_1, "foo", "foo"),
             2.5, 123 * 1024 * 1024,
-            writable_files=[],
             stdin_redirect="input.txt",
             stdout_redirect="output.txt",
             multiprocess=True)
@@ -476,7 +475,6 @@ def test_fileio_diff_success(self):
             sandbox,
             fake_evaluation_commands(EVALUATION_COMMAND_1, "foo", "foo"),
             2.5, 123 * 1024 * 1024,
-            writable_files=["myout"],
             stdin_redirect=None,
             stdout_redirect=None,
             multiprocess=True)

cmstestsuite/unit_tests/grading/tasktypes/CommunicationTest.py

@@ -393,7 +393,6 @@ def test_single_process_success(self):
         self.evaluation_step_before_run.assert_has_calls([
             call(sandbox_mgr, cmdline_mgr, 4321, 1234 * 1024 * 1024,
                  dirs_map={os.path.join(self.base_dir, "0"): ("/fifo0", "rw")},
-                 writable_files=["output.txt"],
                  stdin_redirect="input.txt", multiprocess=True),
             call(sandbox_usr, cmdline_usr, 2.5, 123 * 1024 * 1024,
                  dirs_map={os.path.join(self.base_dir, "0"): ("/fifo0", "rw")},
@@ -422,7 +421,7 @@ def test_single_process_success_long_time_limit(self):
 
         self.evaluation_step_before_run.assert_has_calls([
             call(sandbox_mgr, ANY, 2.5 + 1, ANY, dirs_map=ANY,
-                 writable_files=ANY, stdin_redirect=ANY, multiprocess=ANY)])
+                 stdin_redirect=ANY, multiprocess=ANY)])
 
     def test_single_process_missing_manager(self):
         # Manager is missing, should terminate without creating sandboxes.
@@ -647,7 +646,6 @@ def test_many_processes_success(self):
                      os.path.join(self.base_dir, "0"): ("/fifo0", "rw"),
                      os.path.join(self.base_dir, "1"): ("/fifo1", "rw"),
                  },
-                 writable_files=["output.txt"],
                  stdin_redirect="input.txt", multiprocess=True),
             call(sandbox_usr0, cmdline_usr0, 2.5, 123 * 1024 * 1024,
                  dirs_map={os.path.join(self.base_dir, "0"): ("/fifo0", "rw")},
@@ -684,7 +682,7 @@ def test_many_processes_success_long_time_limit(self):
 
         self.evaluation_step_before_run.assert_has_calls([
             call(sandbox_mgr, ANY, 2 * (2.5 + 1), ANY, dirs_map=ANY,
-                 writable_files=ANY, stdin_redirect=ANY, multiprocess=ANY)])
+                 stdin_redirect=ANY, multiprocess=ANY)])
 
     def test_many_processes_first_user_failure(self):
         # One of the user programs had problems, it's the user's fault.