diff options
| author | maheshgudi | 2016-12-23 15:00:27 +0530 |
|---|---|---|
| committer | maheshgudi | 2016-12-23 15:00:27 +0530 |
| commit | b582c624a7c49e3312e07196df87f26180a520c2 (patch) | |
| tree | 909679721d2fa2b55a27e7621999dd04c9d36146 /yaksh/bash_code_evaluator.py | |
| parent | 5f6b103408ff8a520c741d2d21d1aff24a823dad (diff) | |
| parent | 48366e84b98157ac32b22b2aa19b1c1cde68afd4 (diff) | |
| download | online_test-b582c624a7c49e3312e07196df87f26180a520c2.tar.gz online_test-b582c624a7c49e3312e07196df87f26180a520c2.tar.bz2 online_test-b582c624a7c49e3312e07196df87f26180a520c2.zip | |
fixed pull conflicts
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 1e6fc9c..975af82 100644 --- a/yaksh/bash_code_evaluator.py +++ b/yaksh/bash_code_evaluator.py @@ -104,7 +104,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_stderr, stdnt_stderr @@ -147,7 +147,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, |