WIP more tests, they can't seem to pass unfortunately

Author: top-sekret

sio/executors/test/sources/rlechk.cpp

@@ -25,6 +25,7 @@ int main(int argc, char **argv) {
 			return 0;
 		}
 	}
+	if (fgetc(in) != EOF) puts("WA\nZły wynik\n0");
 
 	puts("OK\nBardzo dobrze\n100");
 

sio/executors/test/sources/rlechn.cpp

@@ -29,6 +29,7 @@ int main(int argc, char **argv) {
 
 		assert(fputc(ch, result) != EOF);
 	}
+	if (fgetc(hint) != EOF) puts("WA\nZły wynik\n0");
 
 	assert(fputs("OK\n", checker) != EOF);
 

sio/executors/test/sources/rleloopdec.cpp

@@ -0,0 +1,51 @@
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+
+void enkoder() {
+	int last = '\n';
+	int ch;
+	std::size_t count = 0;
+
+	while ((ch = std::getchar()) != '\n') {
+		if (ch != last) {
+			if (last != '\n') {
+				std::putchar(last);
+				std::printf("%zu;", count);
+			}
+
+			count = 0;
+		}
+
+		++count;
+		last = ch;
+	}
+
+	if (last != '\n') {
+		std::putchar(last);
+		std::printf("%zu;", count);
+	}
+
+	std::putchar('\n');
+}
+
+void dekoder() {
+	while (true) {}
+}
+
+// rlelib.cpp
+//
+#include <cassert>
+#include <cstdio>
+
+extern void dekoder();
+extern void enkoder();
+
+int main() {
+	int ch = std::getchar();
+
+	assert(ch == 'D' || ch == 'E');
+	assert(std::getchar() == '\n');
+
+	(ch == 'D' ? dekoder : enkoder)();
+}

sio/executors/test/sources/rleloopenc.cpp

@@ -0,0 +1,27 @@
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+
+void enkoder() {
+	while (true) {}
+}
+
+void dekoder() {
+}
+
+// rlelib.cpp
+//
+#include <cassert>
+#include <cstdio>
+
+extern void dekoder();
+extern void enkoder();
+
+int main() {
+	int ch = std::getchar();
+
+	assert(ch == 'D' || ch == 'E');
+	assert(std::getchar() == '\n');
+
+	(ch == 'D' ? dekoder : enkoder)();
+}

sio/executors/test/sources/rlememenc.cpp

@@ -0,0 +1,41 @@
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <vector>
+
+void enkoder() {
+	std::vector<void *> ps;
+	while (true) {
+		ps.push_back(std::malloc(1024 * 1024));
+	}
+}
+
+void dekoder() {
+	int ch;
+
+	while ((ch = std::getchar()) != '\n') {
+		std::size_t count;
+		assert(std::scanf("%zu;", &count) == 1);
+		while (count--) std::putchar(ch);
+	}
+
+	std::putchar('\n');
+}
+
+// rlelib.cpp
+//
+#include <cassert>
+#include <cstdio>
+
+extern void dekoder();
+extern void enkoder();
+
+int main() {
+	int ch = std::getchar();
+
+	assert(ch == 'D' || ch == 'E');
+	assert(std::getchar() == '\n');
+
+	(ch == 'D' ? dekoder : enkoder)();
+}

sio/executors/test/test_encdec.py

@@ -4,14 +4,73 @@
 from filetracker.client.dummy import DummyClient
 from sio.assertion_utils import ok_, eq_
 from sio.compilers.job import run as run_compiler
-from sio.executors.unsafe_exec import encdec_run
+import sio.executors.unsafe_exec
+from sio.testing_utils import str_to_bool
 from sio.workers import ft
 from sio.workers.util import TemporaryCwd, tempcwd
 
 
+
+# Stolen from a sample problem package I used to test the encdec
+EXECUTORS = {'unsafe': sio.executors.unsafe_exec}
+RLE_TESTS = ['0a', '1']
 SOURCES = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'sources')
 
 
+if str_to_bool(os.environ.get('TEST_SIO2JAIL', True)):
+    import sio.executors.sio2jail_exec
+    EXECUTORS['sio2jail'] = sio.executors.sio2jail_exec
+
+
+def common_preparations():
+    with TemporaryCwd():
+        upload_files()
+    with TemporaryCwd('compile_chn'):
+        run_compiler({
+            'source_file': '/rlechn.cpp',
+            'compiler': 'system-cpp',
+            'out_file': '/rlechn.e'
+        })
+    with TemporaryCwd('compile_chk'):
+        run_compiler({
+            'source_file': '/rlechk.cpp',
+            'compiler': 'system-cpp',
+            'out_file': '/rlechk.e'
+        })
+
+
+def compile_file(file):
+    with TemporaryCwd('compile_code'):
+        run_compiler({
+            'source_file': '/%s.cpp' % file,
+            'compiler': 'system-cpp',
+            'out_file': '/%s.e' % file,
+        })
+
+
+def in_(a, b, msg=None):
+    """Shorthand for 'assert a in b, "%r not in %r" % (a, b)"""
+    if a not in b:
+        raise AssertionError(msg or "%r not in %r" % (a, b))
+
+
+def make_run_env(file, test, new_settings=None):
+    result = {
+        'chn_file': '/rlechn.e',
+        'chk_file': '/rlechk.e',
+        'exe_file': '/%s.e' % file,
+        'hint_file': '/rle%s.hint' % test,
+        'in_file': '/rle%s.in' % test,
+        'encoder_memory_limit': '65536',
+        'encoder_time_limit': 2000,
+        'decoder_memory_limit': '65536',
+        'decoder_time_limit': 2000,
+    }
+    if new_settings:
+        result.update(new_settings)
+    return result
+
+
 def not_in_(a, b, msg=None):
     """Shorthand for 'assert a not in b, "%r in %r" % (a, b)"""
     if a in b:
@@ -24,6 +83,16 @@ def print_env(env):
     pprint(env)
 
 
+def run_all_configurations(file, func, new_settings=None):
+    for execname, executor in EXECUTORS.items():
+        for t in RLE_TESTS:
+            with TemporaryCwd('run_%s_%s' % (execname, t)):
+                print('Running test %s under executor %s' % (t, execname))
+                renv = executor.encdec_run(make_run_env(file, t, new_settings(execname, t) if new_settings else None))
+                print_env(renv)
+                func(execname, t, renv)
+
+
 def upload_files():
     "Uploads all files from SOURCES to a newly created dummy filetracker"
 
@@ -34,46 +103,36 @@ def upload_files():
 
 
 def test_encdec_run():
-    with TemporaryCwd():
-        upload_files()
-    with TemporaryCwd('compile_code'):
-        run_compiler({
-            'source_file': '/rle.cpp',
-            'compiler': 'system-cpp',
-            'out_file': '/rle.e'
-        })
-    with TemporaryCwd('compile_chn'):
-        run_compiler({
-            'source_file': '/rlechn.cpp',
-            'compiler': 'system-cpp',
-            'out_file': '/rlechn.e'
-        })
-    with TemporaryCwd('compile_chk'):
-        run_compiler({
-            'source_file': '/rlechk.cpp',
-            'compiler': 'system-cpp',
-            'out_file': '/rlechk.e'
-        })
-    # Stolen from a sample problem package I used to test the encdec
-    with TemporaryCwd('run_0a'):
-        renv = encdec_run({
-            'chn_file': '/rlechn.e',
-            'chk_file': '/rlechk.e',
-            'exe_file': '/rle.e',
-            'hint_file': '/rle0a.hint',
-            'in_file': '/rle0a.in'
-        })
-        print_env(renv)
-        not_in_('failed_step', renv)
-        eq_(renv['checker_result_percentage'], 100.)
-    with TemporaryCwd('run_1'):
-        renv = encdec_run({
-            'chn_file': '/rlechn.e',
-            'chk_file': '/rlechk.e',
-            'exe_file': '/rle.e',
-            'hint_file': '/rle1.hint',
-            'in_file': '/rle1.in'
-        })
-        print_env(renv)
+    common_preparations()
+    compile_file('rle')
+    def check(execname, t, renv):
         not_in_('failed_step', renv)
         eq_(renv['checker_result_percentage'], 100.)
+    run_all_configurations('rle', check)
+
+
+def test_encdec_encoder_timeout():
+    common_preparations()
+    compile_file('rleloopenc')
+    def check(execname, t, renv):
+        eq_(renv['failed_step'], 'encoder')
+        eq_(renv['encoder_result_code'], 'TLE')
+    run_all_configurations('rleloopenc', check)
+
+
+def test_encdec_encoder_outofmem():
+    common_preparations()
+    compile_file('rlememenc')
+    def check(execname, t, renv):
+        eq_(renv['failed_step'], 'encoder')
+        in_(renv['encoder_result_code'], ('MLE', 'RE'))
+    run_all_configurations('rlememenc', check)
+
+
+def test_encdec_decoder_timeout():
+    common_preparations()
+    compile_file('rleloopdec')
+    def check(execname, t, renv):
+        eq_(renv['failed_step'], 'decoder')
+        eq_(renv['decoder_result_code'], 'TLE')
+    run_all_configurations('rleloopdec', check)