Merge pull request #1253 from vahid75/issue-1217

Fixing two deprecations

edx_proctoring/backends/tests/test_backend.py

@@ -4,7 +4,7 @@
 
 import time
 
-from mock import patch
+from unittest.mock import patch
 
 from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase

edx_proctoring/backends/tests/test_rest.py

@@ -7,7 +7,7 @@
 import ddt
 import jwt
 import responses
-from mock import patch
+from unittest.mock import patch
 
 from django.test import TestCase, override_settings
 from django.utils import translation

edx_proctoring/backends/tests/test_software_secure.py

@@ -8,7 +8,7 @@
 
 import ddt
 from httmock import HTTMock, all_requests
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from django.contrib.auth import get_user_model
 from django.test import TestCase

edx_proctoring/management/commands/tests/test_set_attempt_status.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 import pytz
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from django.core.management import call_command
 

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 mock import patch
+from unittest.mock import patch
 
 from django.contrib.auth import get_user_model
 from django.core.management import call_command

edx_proctoring/tests/test_api.py

@@ -10,7 +10,7 @@
 import ddt
 import pytz
 from freezegun import freeze_time
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from django.conf import settings
 from django.core import mail

edx_proctoring/tests/test_email.py

@@ -7,7 +7,7 @@
 from itertools import product
 
 import ddt
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from opaque_keys import InvalidKeyError
 
 from django.conf import settings

edx_proctoring/tests/test_mfe_views.py

@@ -6,7 +6,7 @@
 from urllib.parse import urlencode
 
 import ddt
-from mock import patch
+from unittest.mock import patch
 from opaque_keys.edx.locator import BlockUsageLocator
 
 from django.conf import settings

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)
         )
 

edx_proctoring/tests/test_reviews.py

@@ -6,9 +6,8 @@
 import json
 
 import ddt
-import mock
 from crum import set_current_request
-from mock import call, patch
+from unittest.mock import call, patch
 
 from django.contrib.auth import get_user_model
 from django.test import RequestFactory
@@ -588,7 +587,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 mock.patch('edx_proctoring.api.update_attempt_status') as mock_update_status:
+        with 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

edx_proctoring/tests/test_student_view.py

@@ -12,7 +12,7 @@
 import ddt
 import pytz
 from freezegun import freeze_time
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from django.test.utils import override_settings
 from django.urls import reverse

edx_proctoring/tests/test_views.py

@@ -10,7 +10,7 @@
 import pytz
 from freezegun import freeze_time
 from httmock import HTTMock
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from opaque_keys.edx.locator import BlockUsageLocator
 
 from django.contrib.auth import get_user_model

edx_proctoring/tests/test_workerconfig.py

@@ -6,7 +6,7 @@
 import tempfile
 import unittest
 
-from mock import patch
+from unittest.mock import patch
 
 from django.conf import settings