From 13317f56278969cb6568026d099e15166bfc5d6c Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Wed, 13 May 2015 14:31:42 +0530 Subject: Fix test case fetching for old questions --- testapp/exam/forms.py | 4 ++-- testapp/exam/templates/exam/add_question.html | 2 +- testapp/exam/views.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'testapp/exam') diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 93584a6..74a9b5a 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -187,7 +187,7 @@ class QuestionForm(forms.ModelForm): description = forms.CharField(widget=forms.Textarea\ (attrs={'cols': 40, 'rows': 1})) points = forms.FloatField() - solution = forms.CharField(widget=forms.Textarea\ + test = forms.CharField(widget=forms.Textarea\ (attrs={'cols': 40, 'rows': 1}), required=False) options = forms.CharField(widget=forms.Textarea\ (attrs={'cols': 40, 'rows': 1}), required=False) @@ -216,7 +216,7 @@ class QuestionForm(forms.ModelForm): new_question.summary = summary new_question.description = description new_question.points = points - # new_question.test = test + new_question.test = test new_question.options = options new_question.language = language new_question.type = type diff --git a/testapp/exam/templates/exam/add_question.html b/testapp/exam/templates/exam/add_question.html index 43f09e1..c744549 100644 --- a/testapp/exam/templates/exam/add_question.html +++ b/testapp/exam/templates/exam/add_question.html @@ -30,7 +30,7 @@ Snippet: {{ form.snippet }}{{ form.snippet.errors }} Tags: {{ form.tags }} Options: {{ form.options }} {{form.options.errors}} - Test: {{ form.solution }} {{form.solution.errors}} + Test: {{ form.test }} {{form.test.errors}} Reference Code Path: {{ form.ref_code_path }} {{form.ref_code_path.errors}}
diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 5b7baac..621ec94 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -291,6 +291,7 @@ def edit_question(request): description = request.POST.getlist('description') points = request.POST.getlist('points') options = request.POST.getlist('options') + test = request.POST.getlist('test') type = request.POST.getlist('type') active = request.POST.getlist('active') language = request.POST.getlist('language') -- cgit From 92150265c82f3d1f6e4eb382447ae8e448cd406f Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Wed, 13 May 2015 18:20:26 +0530 Subject: Fix import paths, formatting, views and minor errors - Submitted file path should be set after changing directory - Change timeout duration in java test case - Set shell=True in _compile_command - Fix errors in code as per tests --- testapp/exam/bash_code_evaluator.py | 10 +++++----- testapp/exam/code_evaluator.py | 2 +- testapp/exam/code_server.py | 4 ++-- testapp/exam/cpp_code_evaluator.py | 2 +- testapp/exam/forms.py | 3 ++- testapp/exam/java_code_evaluator.py | 9 +++++---- testapp/exam/scilab_code_evaluator.py | 18 ++++++++++++++---- testapp/exam/tests.py | 2 +- testapp/exam/views.py | 5 ++--- 9 files changed, 33 insertions(+), 22 deletions(-) (limited to 'testapp/exam') diff --git a/testapp/exam/bash_code_evaluator.py b/testapp/exam/bash_code_evaluator.py index 23c0ae5..a468fd7 100644 --- a/testapp/exam/bash_code_evaluator.py +++ b/testapp/exam/bash_code_evaluator.py @@ -16,13 +16,13 @@ class BashCodeEvaluator(CodeEvaluator): ref_code_path=None, in_dir=None): super(BashCodeEvaluator, self).__init__(test_case_data, test, language, user_answer, ref_code_path, in_dir) - self.submit_path = self.create_submit_code_file('submit.sh') self.test_case_args = self._setup() # Private Protocol ########## def _setup(self): super(BashCodeEvaluator, self)._setup() + self.submit_path = self.create_submit_code_file('submit.sh') self._set_file_as_executable(self.submit_path) get_ref_path, get_test_case_path = self.ref_code_path.strip().split(',') get_ref_path = get_ref_path.strip() @@ -73,11 +73,11 @@ class BashCodeEvaluator(CodeEvaluator): success = False if test_case_path is None or "": - ret = self.run_command(ref_path, stdin=None, + ret = self._run_command(ref_path, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc, inst_stdout, inst_stderr = ret - ret = self.run_command(submit_path, stdin=None, + ret = self._run_command(submit_path, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc, stdnt_stdout, stdnt_stderr = ret @@ -103,12 +103,12 @@ class BashCodeEvaluator(CodeEvaluator): loop_count += 1 if valid_answer: args = [ref_path] + [x for x in test_case.split()] - ret = self.run_command(args, stdin=None, + ret = self._run_command(args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc, inst_stdout, inst_stderr = ret args = [submit_path]+[x for x in test_case.split()] - ret = self.run_command(args, stdin=None, + ret = self._run_command(args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc, stdnt_stdout, stdnt_stderr = ret diff --git a/testapp/exam/code_evaluator.py b/testapp/exam/code_evaluator.py index 2a57257..381b2e8 100644 --- a/testapp/exam/code_evaluator.py +++ b/testapp/exam/code_evaluator.py @@ -10,7 +10,7 @@ import subprocess import re import json # Local imports. -from settings import SERVER_PORTS, SERVER_TIMEOUT, SERVER_POOL_PORT +from settings import SERVER_TIMEOUT MY_DIR = abspath(dirname(__file__)) diff --git a/testapp/exam/code_server.py b/testapp/exam/code_server.py index 580379f..1411ded 100755 --- a/testapp/exam/code_server.py +++ b/testapp/exam/code_server.py @@ -30,8 +30,8 @@ import subprocess import re import json # Local imports. -from settings import SERVER_PORTS, SERVER_TIMEOUT, SERVER_POOL_PORT -from language_registry import set_registry +from settings import SERVER_PORTS, SERVER_POOL_PORT +from language_registry import get_registry, set_registry MY_DIR = abspath(dirname(__file__)) diff --git a/testapp/exam/cpp_code_evaluator.py b/testapp/exam/cpp_code_evaluator.py index 15e2b13..7242884 100644 --- a/testapp/exam/cpp_code_evaluator.py +++ b/testapp/exam/cpp_code_evaluator.py @@ -17,7 +17,6 @@ class CppCodeEvaluator(CodeEvaluator): super(CppCodeEvaluator, self).__init__(test_case_data, test, language, user_answer, ref_code_path, in_dir) - self.submit_path = self.create_submit_code_file('submit.c') self.test_case_args = self._setup() # Private Protocol ########## @@ -26,6 +25,7 @@ class CppCodeEvaluator(CodeEvaluator): get_ref_path = self.ref_code_path ref_path, test_case_path = self._set_test_code_file_path(get_ref_path) + self.submit_path = self.create_submit_code_file('submit.c') # Set file paths c_user_output_path = os.getcwd() + '/output' diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 74a9b5a..b56e545 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -1,5 +1,5 @@ from django import forms -from exam.models import Profile, Quiz, Question, TestCase +from testapp.exam.models import Profile, Quiz, Question, TestCase from django.contrib.auth import authenticate from django.contrib.auth.models import User @@ -206,6 +206,7 @@ class QuestionForm(forms.ModelForm): summary = self.cleaned_data.get("summary") description = self.cleaned_data.get("description") points = self.cleaned_data.get("points") + test = self.cleaned_data.get("test") options = self.cleaned_data.get("options") language = self.cleaned_data.get("language") type = self.cleaned_data.get("type") diff --git a/testapp/exam/java_code_evaluator.py b/testapp/exam/java_code_evaluator.py index 08ae208..4367259 100644 --- a/testapp/exam/java_code_evaluator.py +++ b/testapp/exam/java_code_evaluator.py @@ -17,7 +17,6 @@ class JavaCodeEvaluator(CodeEvaluator): super(JavaCodeEvaluator, self).__init__(test_case_data, test, language, user_answer, ref_code_path, in_dir) - self.submit_path = self.create_submit_code_file('Test.java') self.test_case_args = self._setup() # Private Protocol ########## @@ -25,6 +24,7 @@ class JavaCodeEvaluator(CodeEvaluator): super(JavaCodeEvaluator, self)._setup() ref_path, test_case_path = self._set_test_code_file_path(self.ref_code_path) + self.submit_path = self.create_submit_code_file('Test.java') # Set file paths java_student_directory = os.getcwd() + '/' @@ -91,9 +91,10 @@ class JavaCodeEvaluator(CodeEvaluator): main_err = self._remove_null_substitute_char(main_err) if main_err == '': - ret = self._run_command(run_command_args, stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + ret = self._run_command(run_command_args, shell=True, + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) proc, stdout, stderr = ret if proc.returncode == 0: success, err = True, "Correct answer" diff --git a/testapp/exam/scilab_code_evaluator.py b/testapp/exam/scilab_code_evaluator.py index 53640cc..392cd45 100644 --- a/testapp/exam/scilab_code_evaluator.py +++ b/testapp/exam/scilab_code_evaluator.py @@ -17,7 +17,9 @@ class ScilabCodeEvaluator(CodeEvaluator): super(ScilabCodeEvaluator, self).__init__(test_case_data, test, language, user_answer, ref_code_path, in_dir) - self.submit_path = self.create_submit_code_file('function.sci') + + # Removes all the commands that terminates scilab + self.user_answer, self.terminate_commands = self._remove_scilab_exit(user_answer.lstrip()) self.test_case_args = self._setup() # Private Protocol ########## @@ -25,6 +27,7 @@ class ScilabCodeEvaluator(CodeEvaluator): super(ScilabCodeEvaluator, self)._setup() ref_path, test_case_path = self._set_test_code_file_path(self.ref_code_path) + self.submit_path = self.create_submit_code_file('function.sci') return ref_path, # Return as a tuple @@ -36,6 +39,13 @@ class ScilabCodeEvaluator(CodeEvaluator): def _check_code(self, ref_path): success = False + # Throw message if there are commmands that terminates scilab + add_err="" + if self.terminate_commands: + add_err = "Please do not use exit, quit and abort commands in your\ + code.\n Otherwise your code will not be evaluated\ + correctly.\n" + cmd = 'printf "lines(0)\nexec(\'{0}\',2);\nquit();"'.format(ref_path) cmd += ' | timeout 8 scilab-cli -nb' ret = self._run_command(cmd, @@ -63,15 +73,15 @@ class ScilabCodeEvaluator(CodeEvaluator): Removes exit, quit and abort from the scilab code """ new_string = "" - i = 0 + terminate_commands = False for line in string.splitlines(): new_line = re.sub(r"exit.*$", "", line) new_line = re.sub(r"quit.*$", "", new_line) new_line = re.sub(r"abort.*$", "", new_line) if line != new_line: - i = i + 1 + terminate_commands = True new_string = new_string + '\n' + new_line - return new_string, i + return new_string, terminate_commands def _get_error(self, string): """ diff --git a/testapp/exam/tests.py b/testapp/exam/tests.py index ff48c25..7a8d30c 100644 --- a/testapp/exam/tests.py +++ b/testapp/exam/tests.py @@ -1,5 +1,5 @@ from django.utils import unittest -from exam.models import User, Profile, Question, Quiz, QuestionPaper,\ +from testapp.exam.models import User, Profile, Question, Quiz, QuestionPaper,\ QuestionSet, AnswerPaper, Answer, TestCase import datetime, json diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 621ec94..0ca404d 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -20,7 +20,7 @@ from testapp.exam.models import Quiz, Question, QuestionPaper, QuestionSet from testapp.exam.models import Profile, Answer, AnswerPaper, User, TestCase from testapp.exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\ QuestionForm, RandomQuestionForm, TestCaseFormSet -from exam.xmlrpc_clients import code_server +from testapp.exam.xmlrpc_clients import code_server from settings import URL_ROOT from testapp.exam.models import AssignmentUpload @@ -914,9 +914,8 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None): if not user.is_authenticated() or paper.end_time < datetime.datetime.now(): return my_redirect('/exam/login/') + question = get_object_or_404(Question, pk=q_id) - q_paper = QuestionPaper.objects.get(id=questionpaper_id) - paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) test_cases = TestCase.objects.filter(question=question) snippet_code = request.POST.get('snippet') -- cgit