fix eval_output's sandbox index

Author: prandla

cms/grading/tasktypes/Batch.py

@@ -368,7 +368,7 @@ def _evaluate_step(self, job, file_cacher, output_file_params, outcome, text, st
             assert (output_file_params is None) == (outcome is not None)
             if output_file_params is not None:
                 box_success, outcome, text, admin_text = eval_output(
-                    file_cacher, job,
+                    file_cacher, job, 1,
                     self.CHECKER_CODENAME
                     if self._uses_checker() else None,
                     **output_file_params, extra_args=extra_args)

cms/grading/tasktypes/OutputOnly.py

@@ -125,7 +125,7 @@ def evaluate(self, job, file_cacher):
 
         # First and only step: eval the user output.
         box_success, outcome, text, admin_text = eval_output(
-            file_cacher, job,
+            file_cacher, job, 0,
             OutputOnly.CHECKER_CODENAME if self._uses_checker() else None,
             user_output_digest=job.files[user_output_filename].digest)
 

cms/grading/tasktypes/TwoSteps.py

@@ -341,7 +341,7 @@ def evaluate(self, job: EvaluationJob, file_cacher: FileCacher):
                 # Otherwise evaluate the output file.
                 else:
                     box_success, outcome, text, admin_text = eval_output(
-                        file_cacher, job,
+                        file_cacher, job, 2,
                         TwoSteps.CHECKER_CODENAME
                         if self._uses_checker() else None,
                         user_output_path=second_sandbox.relative_path(

cms/grading/tasktypes/util.py

@@ -215,6 +215,7 @@ def check_manager_present(job: Job, codename: str) -> bool:
 def eval_output(
     file_cacher: FileCacher,
     job: Job,
+    box_index: int,
     checker_codename: str | None,
     user_output_path: str | None = None,
     user_output_digest: str | None = None,
@@ -225,6 +226,7 @@ def eval_output(
 
     file_cacher: file cacher to use to get files.
     job: the job triggering this checker run.
+    box_index: which sandbox index to use for the checker.
     checker_codename: codename of the checker amongst the manager,
         or None to use white diff.
     user_output_path: full path of the user output file, None if
@@ -258,7 +260,7 @@ def eval_output(
             return False, None, None, None
 
         # Create a brand-new sandbox just for checking.
-        sandbox = create_sandbox(0, file_cacher, name="check")
+        sandbox = create_sandbox(box_index, file_cacher, name="check")
         job.sandboxes.append(sandbox.get_root_path())
 
         # Put user output in the sandbox.

cmstestsuite/unit_tests/grading/tasktypes/BatchTest.py

@@ -360,7 +360,7 @@ def test_stdio_diff_success(self):
             multiprocess=True)
         # Check eval_output was called correctly.
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, None,
+            self.file_cacher, job, 1, None,
             user_output_path="/path/0/output.txt", user_output_filename="", extra_args=None)
         # Results put in job and sandbox deleted.
         self.assertResultsInJob(job)
@@ -480,7 +480,7 @@ def test_fileio_diff_success(self):
             multiprocess=True)
         # Check eval_output was called correctly.
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, None, user_output_path="/path/0/myout",
+            self.file_cacher, job, 1, None, user_output_path="/path/0/myout",
             user_output_filename="myout", extra_args=None)
         # Results put in job and sandbox deleted.
         self.assertResultsInJob(job)
@@ -495,7 +495,7 @@ def test_stdio_checker_success(self):
 
         # We only perform checks for the final eval step (checker).
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, "checker",
+            self.file_cacher, job, 1, "checker",
             user_output_path="/path/0/output.txt", user_output_filename="", extra_args=None)
         # Results put in job and sandbox deleted.
         self.assertResultsInJob(job)
@@ -510,7 +510,7 @@ def test_fileio_checker_success(self):
 
         # We only perform checks for the final eval step (checker).
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, "checker",
+            self.file_cacher, job, 1, "checker",
             user_output_path="/path/0/myout",
             user_output_filename="myout", extra_args=None)
         # Results put in job and sandbox deleted.

cmstestsuite/unit_tests/grading/tasktypes/OutputOnlyTest.py

@@ -76,7 +76,7 @@ def test_diff_success(self):
         tt.evaluate(job, self.file_cacher)
 
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, None, user_output_digest="digest of 023")
+            self.file_cacher, job, 0, None, user_output_digest="digest of 023")
         self.assertResultsInJob(job, True, str(OUTCOME), TEXT, {})
 
     def test_diff_missing_file(self):
@@ -100,7 +100,7 @@ def test_diff_failure(self):
         tt.evaluate(job, self.file_cacher)
 
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, None, user_output_digest="digest of 023")
+            self.file_cacher, job, 0, None, user_output_digest="digest of 023")
         self.assertResultsInJob(job, False, None, None, None)
 
     def test_comparator_success(self):
@@ -112,7 +112,7 @@ def test_comparator_success(self):
         tt.evaluate(job, self.file_cacher)
 
         self.eval_output.assert_called_once_with(
-            self.file_cacher, job, "checker",
+            self.file_cacher, job, 0, "checker",
             user_output_digest="digest of 023")
         self.assertResultsInJob(job, True, str(OUTCOME), TEXT, {})