diff options
| author | ankitjavalkar | 2017-03-15 16:48:28 +0530 |
|---|---|---|
| committer | ankitjavalkar | 2017-03-15 16:48:28 +0530 |
| commit | 24db3d6821fba560da4c3a4ca03f96ba6daae5a6 (patch) | |
| tree | 94c436eeb52ae5ae6e126539641a521f80c3961b | |
| parent | ce7238aef6d5080d8f7ea79b96c9569bf191f0b8 (diff) | |
| download | online_test-24db3d6821fba560da4c3a4ca03f96ba6daae5a6.tar.gz online_test-24db3d6821fba560da4c3a4ca03f96ba6daae5a6.tar.bz2 online_test-24db3d6821fba560da4c3a4ca03f96ba6daae5a6.zip | |
Multiple fixes in stdio_evaluator and models:
- Change the way stdio output is printed
- Fix minor errors when creating the uploaded file path in the models
| -rw-r--r-- | yaksh/models.py | 2 | ||||
| -rw-r--r-- | yaksh/stdio_evaluator.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/yaksh/models.py b/yaksh/models.py index 398f508..103504e 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -66,7 +66,7 @@ test_status = ( def get_assignment_dir(instance, filename): return os.sep.join(( - instance.user.user, instance.assignmentQuestion.id, filename + instance.user.user.username, str(instance.assignmentQuestion.id), filename )) diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py index fb9dfb3..fa78a68 100644 --- a/yaksh/stdio_evaluator.py +++ b/yaksh/stdio_evaluator.py @@ -14,17 +14,17 @@ class StdIOEvaluator(BaseEvaluator): output_err = output_err_bytes.decode('utf-8') expected_output = expected_output.replace("\r", "") if not expected_input: - error_msg = "Expected Output is {0} ".\ - format(repr(expected_output)) + error_msg = "Expected Output is\n{0} ".\ + format(str(expected_output)) else: - error_msg = " Given Input is\n {0} \n Expected Output is {1} ".\ - format(expected_input, repr(expected_output)) + error_msg = "Given Input is\n{0}\nExpected Output is\n{1}".\ + format(expected_input, str(expected_output)) if output_err == '': if user_output == expected_output: success, err = True, None else: - err = " Incorrect answer\n" + error_msg +\ - "\n Your output is {0}".format(repr(user_output)) + err = "Incorrect answer:\n" + error_msg +\ + "\nYour output is\n{0}".format(str(user_output)) else: - err = "Error:\n {0}".format(output_err) + err = "Error:\n{0}".format(output_err) return success, err |