diff options
| author | adityacp | 2016-12-23 15:03:37 +0530 |
|---|---|---|
| committer | adityacp | 2016-12-23 15:03:37 +0530 |
| commit | d442941819dc7f8b65a2965fbcefe000fea1cde2 (patch) | |
| tree | 624d8ba12cf83cf57f685bc8cee158be14aee783 /yaksh/bash_code_evaluator.py | |
| parent | 14b628f49a7d0aa58c22c021c62a5d0a748ae881 (diff) | |
| parent | 48366e84b98157ac32b22b2aa19b1c1cde68afd4 (diff) | |
| download | online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.tar.gz online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.tar.bz2 online_test-d442941819dc7f8b65a2965fbcefe000fea1cde2.zip | |
Fix conflict
Diffstat (limited to 'yaksh/bash_code_evaluator.py')
| -rw-r--r-- | yaksh/bash_code_evaluator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yaksh/bash_code_evaluator.py b/yaksh/bash_code_evaluator.py index 380dad3..9da404a 100644 --- a/yaksh/bash_code_evaluator.py +++ b/yaksh/bash_code_evaluator.py @@ -113,7 +113,7 @@ class BashCodeEvaluator(BaseEvaluator): proc, stdnt_stdout, stdnt_stderr = ret if inst_stdout == stdnt_stdout: mark_fraction = float(self.weight) if self.partial_grading else 0.0 - return True, "Correct answer", mark_fraction + return True, None, mark_fraction else: err = "Error: expected %s, got %s" % (inst_stdout + inst_stderr, stdnt_stdout + stdnt_stderr @@ -156,7 +156,7 @@ class BashCodeEvaluator(BaseEvaluator): valid_answer = inst_stdout == stdnt_stdout if valid_answer and (num_lines == loop_count): mark_fraction = float(self.weight) if self.partial_grading else 0.0 - return True, "Correct answer", mark_fraction + return True, None, mark_fraction else: err = ("Error:expected" " {0}, got {1}").format(inst_stdout+inst_stderr, |