fixed timeout message

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.vscode
 .venv
 bin
 __pycache__

source/StudentSubmission/common.py

@@ -1,14 +1,6 @@
 from enum import Enum
 from typing import List, Any
 
-class PossibleResults(Enum):
-    STDOUT = "stdout"
-    RETURN_VAL = "return_val"
-    FILE_OUT = "file_out"
-    FILE_HASH = "file_hash"
-    MOCK_SIDE_EFFECTS = "mock"
-    EXCEPTION = "exception"
-
 class ValidationHook(Enum):
     PRE_LOAD = 1
     POST_LOAD = 2
@@ -32,6 +24,14 @@ def __reduce__(self):
         # Need to be (something,) so that it actually gets processed as a tuple in the pickler
         return (MissingFunctionDefinition, (self.functionName,))
 
+class TimeoutError(Exception):
+    def __init__(self, timeout: int):
+        super().__init__(f"Submission timed out after {timeout} seconds")
+        self.timeout = timeout
+
+    def __reduce__(self):
+        return (TimeoutError, (self.timeout,))
+
 class InvalidTestCaseSetupCode(Exception):
     def __init__(self, *args):
         super().__init__(

source/StudentSubmissionImpl/Python/PythonSubmissionProcess.py

@@ -22,6 +22,7 @@
 from io import StringIO
 
 from Executors.common import MissingOutputDataException, detectFileSystemChanges, filterStdOut
+from StudentSubmission.common import TimeoutError
 from StudentSubmissionImpl.Python.PythonRunners import GenericPythonRunner
 
 dill.Pickler.dumps, dill.Pickler.loads = dill.dumps, dill.loads
@@ -213,6 +214,8 @@ def setup(self, environment: ExecutionEnvironment, runner: GenericPythonRunner):
 
         self.inputSharedMem.buf[:len(serializedStdin)] = serializedStdin
 
+        self.timeoutTime = environment.timeout
+
     def run(self):
         if self.studentSubmissionProcess is None:
             raise AttributeError("Process has not be initalized!")
@@ -252,7 +255,7 @@ def cleanup(self):
 
 
         if self.timeoutOccurred:
-            self.exception = TimeoutError(f"Submission timed out after {self.timeoutTime} seconds")
+            self.exception = TimeoutError(self.timeoutTime)
             self._deallocate()
             return
 

tests/impl/python/testPythonSubmissionProcess.py

@@ -10,6 +10,7 @@
 from TestingFramework.SingleFunctionMock import SingleFunctionMock
 from StudentSubmission.common import MissingFunctionDefinition, InvalidTestCaseSetupCode
 from Executors.common import MissingOutputDataException
+from StudentSubmission.common import TimeoutError
 
 
 class TestPythonSubmissionProcess(unittest.TestCase):
@@ -243,6 +244,32 @@ def testTerminateInfiniteLoopWithInput(self):
 
         self.assertNotIn(PossibleResults.STDOUT, results)
 
+    def testCorrectTimeoutError(self):
+        program = \
+                "while True:\n"\
+                "   print('OUTPUT LOOP:)')\n"
+
+        runner = MainModuleRunner()
+        runner.setSubmission(compile(program, "test_code", "exec"))
+
+        self.environment.timeout = 5
+
+        self.runnableSubmission.setup(self.environment, runner)
+        self.runnableSubmission.run()
+        self.runnableSubmission.cleanup()
+
+        self.runnableSubmission.populateResults(self.environment)
+
+        results = self.environment.resultData
+
+        with self.assertRaises(TimeoutError) as ex:
+            raise results[PossibleResults.EXCEPTION]
+
+        exceptionText = str(ex.exception)
+        self.assertIn("timed out after 5 seconds", exceptionText)
+
+        self.assertNotIn(PossibleResults.STDOUT, results)
+
     def testHandledExceptionInfiniteRecursion(self):
         program = \
                 "def loop():\n"\