summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2016-01-12 13:14:05 +0100
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2016-01-12 13:14:05 +0100
commitf1521c9769f9b28cf658a9255dbfc16c98870da9 (patch)
tree702bda9a5ef6210e2139633dc18c69fe995f1b92 /server
parent740e128bb32075279dd62c677b27c645805cb5e2 (diff)
Get number of passed/total tests from Prolog test functions
Diffstat (limited to 'server')
-rw-r--r--server/prolog_session.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/server/prolog_session.py b/server/prolog_session.py
index 8a5b6e3..121f802 100644
--- a/server/prolog_session.py
+++ b/server/prolog_session.py
@@ -122,8 +122,8 @@ class PrologSession(server.LanguageSession):
hints = []
try:
# check if the program is already correct
- passed, _ = problem_module.test(program, aux_code=aux_code)
- if passed:
+ n_correct, n_all, _ = problem_module.test(program, aux_code=aux_code)
+ if n_correct == n_all:
hints = [{'id': 'program_already_correct'}]
if not hints and hasattr(language_module, 'hint'):
@@ -133,8 +133,8 @@ class PrologSession(server.LanguageSession):
if not hints and problem_id in _edits:
# Testing function for monkey.
def tester(code):
- passed, hints = problem_module.test(code, aux_code=aux_code)
- return passed
+ n_correct, n_all, _ = problem_module.test(code, aux_code=aux_code)
+ return n_correct, n_all
solution, steps, fix_time, n_tested = monkey.fix(
program, _edits[problem_id], tester, timeout=5, debug=True)
if solution and steps:
@@ -156,8 +156,8 @@ class PrologSession(server.LanguageSession):
aux_code = self._aux_code(session.get_uid(), problem, program)
try:
- passed, hints = problem_module.test(program, aux_code=aux_code)
- if passed:
+ n_correct, n_all, hints = problem_module.test(program, aux_code=aux_code)
+ if n_correct == n_all:
session.update_solution(problem_id, done=True)
except AttributeError as ex:
hints = [{'id': 'system_error', 'args': {'message': 'test function does not exist'}}]