add CompareMismatch & timeout

Author: TitanSnow

cyaron/compare.py

@@ -10,6 +10,13 @@
 import os
 
 
+class CompareMismatch(ValueError):
+    def __init__(self, name, mismatch):
+        super(CompareMismatch, self).__init__(name, mismatch)
+        self.name = name
+        self.mismatch = mismatch
+
+
 class Compare:
     @staticmethod
     def __compare_two(name, content, std, grader):
@@ -18,7 +25,7 @@ def __compare_two(name, content, std, grader):
         info = info if info is not None else ""
         log.debug("{}: {} {}".format(name, status, info))
         if not result:
-            raise info
+            raise CompareMismatch(name, info)
 
     @staticmethod
     def __process_file(file):
@@ -111,8 +118,14 @@ def get_std():
             raise TypeError('program() missing 1 required non-None keyword-only argument: \'std\' or \'std_program\'')
 
         def do(program_name):
+            timeout = None
+            if list_like(program_name) and len(program_name) == 2 and int_like(program_name[-1]):
+                program_name, timeout = program_name
             with open(os.dup(input.input_file.fileno()), 'r', newline='\n') as input_file:
-                content = make_unicode(subprocess.check_output(program_name, shell=(not list_like(program_name)), stdin=input_file, universal_newlines=True))
+                if timeout is None:
+                    content = make_unicode(subprocess.check_output(program_name, shell=(not list_like(program_name)), stdin=input_file, universal_newlines=True))
+                else:
+                    content = make_unicode(subprocess.check_output(program_name, shell=(not list_like(program_name)), stdin=input_file, universal_newlines=True, timeout=timeout))
             cls.__compare_two(program_name, content, std, grader)
 
         if job_pool is not None:

cyaron/tests/compare_test.py

@@ -3,9 +3,11 @@
 import sys
 import shutil
 import tempfile
+import subprocess
 from cyaron import IO, Compare, log
 from cyaron.output_capture import captured_output
 from cyaron.graders.mismatch import *
+from cyaron.compare import CompareMismatch
 
 log.set_verbose()
 
@@ -48,7 +50,9 @@ def test_noipstyle_incorrect(self):
         try:
             with captured_output() as (out, err):
                 Compare.output("test_another_incorrect.out", std=io)
-        except TextMismatch as e:
+        except CompareMismatch as e:
+            self.assertEqual(e.name, 'test_another_incorrect.out')
+            e = e.mismatch
             self.assertEqual(e.content, 'test123\r\ntest124 ')
             self.assertEqual(e.std, 'test123 \ntest123\n\n')
             self.assertEqual(str(e), 'On line 2 column 7, read 4, expected 3.')
@@ -74,7 +78,9 @@ def test_fulltext_program(self):
         try:
             with captured_output() as (out, err):
                 Compare.program("python correct.py", "python incorrect.py", std=io, input=io, grader="FullText")
-        except HashMismatch as e:
+        except CompareMismatch as e:
+            self.assertEqual(e.name, 'python incorrect.py')
+            e = e.mismatch
             self.assertEqual(e.content, '2\n')
             self.assertEqual(e.std, '1\n')
             self.assertEqual(e.content_hash, '53c234e5e8472b6ac51c1ae1cab3fe06fad053beb8ebfd8977b010655bfdd3c3')
@@ -106,3 +112,13 @@ def test_concurrent(self):
         finally:
             for io in ios:
                 io.close()
+
+    def test_timeout(self):
+        if sys.version_info >= (3, 3):
+            with IO() as test:
+                try:
+                    Compare.program(((sys.executable, '-c', '__import__(\'time\').sleep(10)'), 1), std=test, input=test)
+                except subprocess.TimeoutExpired:
+                    pass
+                else:
+                    self.assertTrue(False)

cyaron/utils.py

@@ -13,6 +13,16 @@ def list_like(data):
     return isinstance(data, tuple) or isinstance(data, list)
 
 
+def int_like(data):
+    isint = False
+    try:
+        isint = isint or isinstance(date, long)
+    except NameError:
+        pass
+    isint = isint or isinstance(data, int)
+    return isint
+
+
 def strtolines(str):
     lines = str.split('\n')
     for i in range(len(lines)):