diff options
| author | prathamesh | 2016-11-17 13:58:51 +0530 |
|---|---|---|
| committer | prathamesh | 2016-11-17 13:58:51 +0530 |
| commit | 93b16753ded5f3ef07187e9413c94bd52f2e77f7 (patch) | |
| tree | f137a0fd2a3036c5a6e87d323d8d14ee3d480c0b /yaksh/bash_stdio_evaluator.py | |
| parent | 6ac9e99453543e6a5533f5ab77c7db3c08cc0cf9 (diff) | |
| parent | aa6ed71496c4a36faed9b42104c8426345bdc2e3 (diff) | |
| download | online_test-93b16753ded5f3ef07187e9413c94bd52f2e77f7.tar.gz online_test-93b16753ded5f3ef07187e9413c94bd52f2e77f7.tar.bz2 online_test-93b16753ded5f3ef07187e9413c94bd52f2e77f7.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into student-interface
Resolved
Conflicts:
yaksh/templates/yaksh/question.html
Added testarea back for now.
Diffstat (limited to 'yaksh/bash_stdio_evaluator.py')
| -rw-r--r-- | yaksh/bash_stdio_evaluator.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/yaksh/bash_stdio_evaluator.py b/yaksh/bash_stdio_evaluator.py index a7ea1a4..1dd9fd5 100644 --- a/yaksh/bash_stdio_evaluator.py +++ b/yaksh/bash_stdio_evaluator.py @@ -14,6 +14,7 @@ class BashStdioEvaluator(StdIOEvaluator): def setup(self): super(BashStdioEvaluator, self).setup() + self.files = [] self.submit_code_path = self.create_submit_code_file('Test.sh') def teardown(self): @@ -22,8 +23,7 @@ class BashStdioEvaluator(StdIOEvaluator): delete_files(self.files) super(BashStdioEvaluator, self).teardown() - def compile_code(self, user_answer, file_paths, expected_input, expected_output): - self.files = [] + def compile_code(self, user_answer, file_paths, expected_input, expected_output, weight): if file_paths: self.files = copy_files(file_paths) if not isfile(self.submit_code_path): @@ -33,8 +33,11 @@ class BashStdioEvaluator(StdIOEvaluator): user_answer = user_answer.replace("\r", "") self.write_to_submit_code_file(self.submit_code_path, user_answer) - def check_code(self, user_answer, file_paths, expected_input, expected_output): + def check_code(self, user_answer, file_paths, partial_grading, + expected_input, expected_output, weight): success = False + test_case_weight = 0.0 + expected_input = str(expected_input).replace('\r', '') proc = subprocess.Popen("bash ./Test.sh", shell=True, @@ -46,4 +49,5 @@ class BashStdioEvaluator(StdIOEvaluator): expected_input, expected_output ) - return success, err + test_case_weight = float(weight) if partial_grading and success else 0.0 + return success, err, test_case_weight |