Remove double timeouts

execute.py

@@ -116,8 +116,7 @@ def unsafe_execute_cpp(check_program, result, timeout):
             result.append(f"failed: compilation error: {err}")
         else:
             try:
-                with time_limit(timeout):
-                    exec_result = subprocess.run(["./a.out"], timeout=timeout, capture_output=True)
+                exec_result = subprocess.run(["./a.out"], timeout=timeout, capture_output=True)
 
                 if exec_result.returncode == 0:
                     result.append("passed")
@@ -134,21 +133,21 @@ def unsafe_execute_cpp(check_program, result, timeout):
                             err = exec_result.stdout
                     result.append(f"failed: {err}")                 
 
-            except TimeoutException:
+            except subprocess.TimeoutExpired as e:
                 result.append("timed out")            
 
 def unsafe_execute_java(check_program, result, timeout):
 
     with create_tempdir():
-
         open(f"Main.java", 'w').write(check_program)
 
         res = "failed: unknown error"
         compile_returncode = -1
         for _ in range(5):
             try:
-                compilation_result = subprocess.run(['javac', "Main.java"], timeout=5,
-                                                    capture_output=True)
+                compilation_result = subprocess.run(
+                    ['javac', "Main.java"], timeout=5, capture_output=True
+                )
                 compile_returncode = compilation_result.returncode
                 break
             except subprocess.TimeoutExpired as e:
@@ -157,8 +156,7 @@ def unsafe_execute_java(check_program, result, timeout):
             res = "failed: compilation error"
         else:
             try:
-                with time_limit(timeout):
-                    exec_result = subprocess.run([f'java', '-cp', tmp_dir, 'Main'], timeout=timeout, capture_output=True)
+                exec_result = subprocess.run([f'java', '-cp', tmp_dir, 'Main'], timeout=timeout, capture_output=True)
                 if exec_result.returncode == 0:
                     res = "passed"
                 elif exec_result.returncode == 1:
@@ -166,26 +164,22 @@ def unsafe_execute_java(check_program, result, timeout):
                         res = "failed: wrong answer"
                     else:
                         res = f"failed: {exec_result.stderr.decode()}"
-                except subprocess.TimeoutExpired as e:
-                    res = "timed out"
-                except BaseException as e:
-                    res = f"failed: {e}"
-                result.append(res)             
+            except subprocess.TimeoutExpired as e:
+                res = "timed out"
+            except BaseException as e:
+                res = f"failed: {e}"
 
-            except TimeoutException:
-                result.append("timed out")
+        result.append(res)
 
 def unsafe_execute_js(check_program, result, timeout):
 
     with create_tempdir():
-
         open(f"test.js", 'w').write(check_program)
 
         # Run program.
         try:
             exec_globals = {}
-            with time_limit(timeout):
-                exec_result = subprocess.run(["node", "test.js"], timeout=timeout, capture_output=True)
+            exec_result = subprocess.run(["node", "test.js"], timeout=timeout, capture_output=True)
             if exec_result.stderr.decode():
                 err = exec_result.stderr.decode()
                 result.append(f"failed: {err}")
@@ -195,7 +189,7 @@ def unsafe_execute_js(check_program, result, timeout):
             else:
                 result.append("passed")
 
-        except TimeoutException:
+        except subprocess.TimeoutExpired as e:
             result.append("timed out")