Commit a7fb2e2f by Chris Dodge

fix broken tests

parent a871d5f6
...@@ -8,7 +8,7 @@ API which is in the views.py file, per edX coding standards ...@@ -8,7 +8,7 @@ API which is in the views.py file, per edX coding standards
""" """
import pytz import pytz
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.template import Context, Template, loader from django.template import Context, loader
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from edx_proctoring.exceptions import ( from edx_proctoring.exceptions import (
...@@ -226,10 +226,8 @@ def get_student_view(user_id, course_id, content_id, context): ...@@ -226,10 +226,8 @@ def get_student_view(user_id, course_id, content_id, context):
exam_id = None exam_id = None
try: try:
exam = get_exam_by_content_id(course_id, content_id) exam = get_exam_by_content_id(course_id, content_id)
print '**** exam = {}'.format(exam)
exam_id = exam['id'] exam_id = exam['id']
except Exception, ex: except ProctoredExamNotFoundException:
print '*** exception = {}'.format(unicode(ex))
exam_id = create_exam( exam_id = create_exam(
course_id=course_id, course_id=course_id,
content_id=unicode(content_id), content_id=unicode(content_id),
......
"""Defines serializers used by the Proctoring API.""" """Defines serializers used by the Proctoring API."""
from django.conf import settings
from rest_framework import serializers from rest_framework import serializers
from edx_proctoring.models import ProctoredExam, ProctoredExamStudentAttempt, ProctoredExamStudentAllowance from edx_proctoring.models import ProctoredExam, ProctoredExamStudentAttempt, ProctoredExamStudentAllowance
...@@ -21,7 +20,7 @@ class ProctoredExamSerializer(serializers.ModelSerializer): ...@@ -21,7 +20,7 @@ class ProctoredExamSerializer(serializers.ModelSerializer):
""" """
Serializer for the ProctoredExam Model. Serializer for the ProctoredExam Model.
""" """
id = serializers.IntegerField(required=True) id = serializers.IntegerField(required=False)
course_id = serializers.CharField(required=True) course_id = serializers.CharField(required=True)
content_id = serializers.CharField(required=True) content_id = serializers.CharField(required=True)
external_id = serializers.CharField(required=True) external_id = serializers.CharField(required=True)
......
...@@ -15,6 +15,7 @@ class TestProctoredExamSerializer(unittest.TestCase): ...@@ -15,6 +15,7 @@ class TestProctoredExamSerializer(unittest.TestCase):
Tests the boolean fields. Should cause a validation error in case a field is required. Tests the boolean fields. Should cause a validation error in case a field is required.
""" """
data = { data = {
'id': "123",
'course_id': "a/b/c", 'course_id': "a/b/c",
'exam_name': "midterm1", 'exam_name': "midterm1",
'content_id': '123aXqe0', 'content_id': '123aXqe0',
......
"""
Test for the xBlock service
"""
import unittest
from edx_proctoring.services import ProctoringService
from edx_proctoring import api as edx_proctoring_api
import types
class TestProctoringService(unittest.TestCase):
"""
Tests for ProctoringService
"""
def test_basic(self):
"""
See if the ProctoringService exposes the expected methods
"""
service = ProctoringService()
for attr_name in dir(edx_proctoring_api):
attr = getattr(edx_proctoring_api, attr_name, None)
if isinstance(attr, types.FunctionType) and not attr_name.startswith('_'):
self.assertTrue(hasattr(service, attr_name))
...@@ -7,7 +7,6 @@ import pytz ...@@ -7,7 +7,6 @@ import pytz
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.db import IntegrityError
from rest_framework import status from rest_framework import status
from rest_framework.response import Response from rest_framework.response import Response
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment