diff --git a/edx_proctoring/backends/tests/test_backend.py b/edx_proctoring/backends/tests/test_backend.py index 4623f9e715..e51b0d88a9 100644 --- a/edx_proctoring/backends/tests/test_backend.py +++ b/edx_proctoring/backends/tests/test_backend.py @@ -4,7 +4,7 @@ import time -from unittest.mock import patch +from mock import patch from django.core.exceptions import ImproperlyConfigured from django.test import TestCase diff --git a/edx_proctoring/backends/tests/test_rest.py b/edx_proctoring/backends/tests/test_rest.py index 22d3b3bd84..d46fad2c2d 100644 --- a/edx_proctoring/backends/tests/test_rest.py +++ b/edx_proctoring/backends/tests/test_rest.py @@ -7,7 +7,7 @@ import ddt import jwt import responses -from unittest.mock import patch +from mock import patch from django.test import TestCase, override_settings from django.utils import translation diff --git a/edx_proctoring/backends/tests/test_software_secure.py b/edx_proctoring/backends/tests/test_software_secure.py index 3d72a49747..c0b6628d36 100644 --- a/edx_proctoring/backends/tests/test_software_secure.py +++ b/edx_proctoring/backends/tests/test_software_secure.py @@ -8,7 +8,7 @@ import ddt from httmock import HTTMock, all_requests -from unittest.mock import MagicMock, patch +from mock import MagicMock, patch from django.contrib.auth import get_user_model from django.test import TestCase diff --git a/edx_proctoring/management/commands/tests/test_set_attempt_status.py b/edx_proctoring/management/commands/tests/test_set_attempt_status.py index ab51967e3b..8ae94e969f 100644 --- a/edx_proctoring/management/commands/tests/test_set_attempt_status.py +++ b/edx_proctoring/management/commands/tests/test_set_attempt_status.py @@ -5,7 +5,7 @@ from datetime import datetime import pytz -from unittest.mock import MagicMock, patch +from mock import MagicMock, patch from django.core.management import call_command diff --git a/edx_proctoring/management/commands/tests/test_update_attempts_for_exam.py b/edx_proctoring/management/commands/tests/test_update_attempts_for_exam.py index cd47fb5c16..b578de9745 100644 --- a/edx_proctoring/management/commands/tests/test_update_attempts_for_exam.py +++ b/edx_proctoring/management/commands/tests/test_update_attempts_for_exam.py @@ -2,7 +2,7 @@ Tests for the update_attempts_for_exam management command """ -from unittest.mock import patch +from mock import patch from django.contrib.auth import get_user_model from django.core.management import call_command diff --git a/edx_proctoring/tests/test_api.py b/edx_proctoring/tests/test_api.py index f1f92b12c4..0850562942 100644 --- a/edx_proctoring/tests/test_api.py +++ b/edx_proctoring/tests/test_api.py @@ -10,7 +10,7 @@ import ddt import pytz from freezegun import freeze_time -from unittest.mock import MagicMock, patch +from mock import MagicMock, patch from django.conf import settings from django.core import mail diff --git a/edx_proctoring/tests/test_email.py b/edx_proctoring/tests/test_email.py index ffa8c9ecc2..4df3595c5e 100644 --- a/edx_proctoring/tests/test_email.py +++ b/edx_proctoring/tests/test_email.py @@ -7,7 +7,7 @@ from itertools import product import ddt -from unittest.mock import MagicMock, patch +from mock import MagicMock, patch from opaque_keys import InvalidKeyError from django.conf import settings diff --git a/edx_proctoring/tests/test_mfe_views.py b/edx_proctoring/tests/test_mfe_views.py index eedbb3c95e..c467caab61 100644 --- a/edx_proctoring/tests/test_mfe_views.py +++ b/edx_proctoring/tests/test_mfe_views.py @@ -6,7 +6,7 @@ from urllib.parse import urlencode import ddt -from unittest.mock import patch +from mock import patch from opaque_keys.edx.locator import BlockUsageLocator from django.conf import settings diff --git a/edx_proctoring/tests/test_models.py b/edx_proctoring/tests/test_models.py index 30c4ba805e..f717bd3afa 100644 --- a/edx_proctoring/tests/test_models.py +++ b/edx_proctoring/tests/test_models.py @@ -192,7 +192,7 @@ def test_get_practice_proctored_exams_for_course(self): is_practice_exam=True ) - self.assertQuerySetEqual( + self.assertQuerysetEqual( ProctoredExam.get_practice_proctored_exams_for_course(course_id), list(practice_proctored_exams) ) diff --git a/edx_proctoring/tests/test_reviews.py b/edx_proctoring/tests/test_reviews.py index fbf0163947..68ffd5fcd7 100644 --- a/edx_proctoring/tests/test_reviews.py +++ b/edx_proctoring/tests/test_reviews.py @@ -6,8 +6,9 @@ import json import ddt +import mock from crum import set_current_request -from unittest.mock import call, patch +from mock import call, patch from django.contrib.auth import get_user_model from django.test import RequestFactory @@ -587,7 +588,7 @@ def test_review_update_attempt_active_field(self): self.assertTrue(review.is_attempt_active) # now delete the attempt, which puts it into the archive table - with patch('edx_proctoring.api.update_attempt_status') as mock_update_status: + with mock.patch('edx_proctoring.api.update_attempt_status') as mock_update_status: remove_exam_attempt(self.attempt_id, requesting_user=self.user) # check that the field has been updated diff --git a/edx_proctoring/tests/test_student_view.py b/edx_proctoring/tests/test_student_view.py index a875ce3c9d..b64b824951 100644 --- a/edx_proctoring/tests/test_student_view.py +++ b/edx_proctoring/tests/test_student_view.py @@ -12,7 +12,7 @@ import ddt import pytz from freezegun import freeze_time -from unittest.mock import MagicMock, patch +from mock import MagicMock, patch from django.test.utils import override_settings from django.urls import reverse diff --git a/edx_proctoring/tests/test_views.py b/edx_proctoring/tests/test_views.py index 075cb84fec..aef30172f1 100644 --- a/edx_proctoring/tests/test_views.py +++ b/edx_proctoring/tests/test_views.py @@ -10,7 +10,7 @@ import pytz from freezegun import freeze_time from httmock import HTTMock -from unittest.mock import Mock, patch +from mock import Mock, patch from opaque_keys.edx.locator import BlockUsageLocator from django.contrib.auth import get_user_model diff --git a/edx_proctoring/tests/test_workerconfig.py b/edx_proctoring/tests/test_workerconfig.py index f2ab2d7e3f..8bd462b4fc 100644 --- a/edx_proctoring/tests/test_workerconfig.py +++ b/edx_proctoring/tests/test_workerconfig.py @@ -6,7 +6,7 @@ import tempfile import unittest -from unittest.mock import patch +from mock import patch from django.conf import settings