summaryrefslogtreecommitdiff
path: root/testapp/exam
diff options
context:
space:
mode:
Diffstat (limited to 'testapp/exam')
-rw-r--r--testapp/exam/bash_code_evaluator.py10
-rw-r--r--testapp/exam/code_evaluator.py2
-rwxr-xr-xtestapp/exam/code_server.py4
-rw-r--r--testapp/exam/cpp_code_evaluator.py2
-rw-r--r--testapp/exam/forms.py3
-rw-r--r--testapp/exam/java_code_evaluator.py9
-rw-r--r--testapp/exam/scilab_code_evaluator.py18
-rw-r--r--testapp/exam/tests.py2
-rw-r--r--testapp/exam/views.py5
9 files changed, 33 insertions, 22 deletions
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')
generated by cgit (git 2.34.1) at 2024-12-21 09:18:37 +0000