diff options
author | ankitjavalkar | 2016-12-21 18:09:49 +0530 |
---|---|---|
committer | ankitjavalkar | 2016-12-21 18:17:48 +0530 |
commit | a88197040b69a556f9c7b0432350b9d1d4aad06f (patch) | |
tree | 9a3dd0a6a7977033d28e351c8a866c495449c530 /yaksh/python_assertion_evaluator.py | |
parent | fb991b4792b48c80e269236bf5aa28a70d34dbf6 (diff) | |
download | online_test-a88197040b69a556f9c7b0432350b9d1d4aad06f.tar.gz online_test-a88197040b69a556f9c7b0432350b9d1d4aad06f.tar.bz2 online_test-a88197040b69a556f9c7b0432350b9d1d4aad06f.zip |
Fix rendering and representation of errors
- Error are sent as list
- Error are None if answer is fully correct
- Error is rendered as in grade user and code questions as neat CSS divs
- Fix corresponding test cases
- Fix get_question answers in models.py
Diffstat (limited to 'yaksh/python_assertion_evaluator.py')
-rw-r--r-- | yaksh/python_assertion_evaluator.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/yaksh/python_assertion_evaluator.py b/yaksh/python_assertion_evaluator.py index 41ebeb6..d8cd07c 100644 --- a/yaksh/python_assertion_evaluator.py +++ b/yaksh/python_assertion_evaluator.py @@ -76,8 +76,13 @@ class PythonAssertionEvaluator(BaseEvaluator): info = traceback.extract_tb(tb) fname, lineno, func, text = info[-1] text = str(self.test_case) - err = ("-----\nExpected Test Case:\n{0}\n" - "Error - {1} {2} in: {3}\n-----").format(self.test_case, type.__name__, str(value), text) + err = "Expected Test Case:\n{0}\n" \ + "Error - {1} {2} in: {3}\n-----".format( + self.test_case, + type.__name__, + str(value), + text + ) except TimeoutException: raise except Exception: @@ -85,7 +90,7 @@ class PythonAssertionEvaluator(BaseEvaluator): err = "Error in Test case: {0}".format(msg) else: success = True - err = '-----\nCorrect answer\nTest Case: {0}\n-----'.format(self.test_case) + err = None mark_fraction = float(self.weight) if self.partial_grading else 0.0 del tb return success, err, mark_fraction |