Remove conflicts from views after rebase

1 files changed, 10 insertions, 3 deletions

diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py
index fa78a68..554d4c5 100644
--- a/yaksh/stdio_evaluator.py
+++ b/yaksh/stdio_evaluator.py
@@ -1,7 +1,10 @@
 from __future__ import unicode_literals
+import os
+import signal
 
 # Local imports
 from .base_evaluator import BaseEvaluator
+from .grader import TimeoutException
 
 
 class StdIOEvaluator(BaseEvaluator):
@@ -9,9 +12,13 @@ class StdIOEvaluator(BaseEvaluator):
         success = False
         ip = expected_input.replace(",", " ")
         encoded_input = '{0}\n'.format(ip).encode('utf-8')
-        user_output_bytes, output_err_bytes = proc.communicate(encoded_input)
-        user_output = user_output_bytes.decode('utf-8')
-        output_err = output_err_bytes.decode('utf-8')
+        try:
+            user_output_bytes, output_err_bytes = proc.communicate(encoded_input)
+            user_output = user_output_bytes.decode('utf-8')
+            output_err = output_err_bytes.decode('utf-8')
+        except TimeoutException:
+            os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
+            raise
         expected_output = expected_output.replace("\r", "")
         if not expected_input:
             error_msg = "Expected Output is\n{0} ".\