From 6529ab2bfcb416288073d9e91b85cd54c91e8325 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 8 May 2023 21:19:43 +0200
Subject: [PATCH] Use unittest.mock rather than mock

Since python 3.4 the backported module mock is no longer
needed and the builtin unittest.mock can be used instead.
---
 tests/requirements.txt    | 1 -
 tests/test_auth.py        | 2 +-
 tests/test_contrib_drf.py | 8 ++++----
 tests/test_middleware.py  | 2 +-
 tests/test_utils.py       | 2 +-
 tests/test_views.py       | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 14fe0d3e..e69de29b 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1 +0,0 @@
-mock==2.0.0
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 762572c1..2bb83e47 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -1,5 +1,5 @@
 import json
-from mock import Mock, call, patch
+from unittest.mock import Mock, call, patch
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes, hmac
diff --git a/tests/test_contrib_drf.py b/tests/test_contrib_drf.py
index 49fa4686..84237509 100644
--- a/tests/test_contrib_drf.py
+++ b/tests/test_contrib_drf.py
@@ -1,4 +1,4 @@
-import mock
+import unittest.mock
 
 from django.core.exceptions import SuspiciousOperation
 from django.test import RequestFactory, TestCase, override_settings
@@ -13,11 +13,11 @@ class TestDRF(TestCase):
     @override_settings(OIDC_RP_CLIENT_ID="example_id")
     @override_settings(OIDC_RP_CLIENT_SECRET="client_secret")
     def setUp(self):
-        self.auth = OIDCAuthentication(backend=mock.Mock())
+        self.auth = OIDCAuthentication(backend=unittest.mock.Mock())
         self.request = RequestFactory().get("/", HTTP_AUTHORIZATION="Bearer faketoken")
 
     def test_authenticate_returns_none_if_no_access_token(self):
-        with mock.patch.object(self.auth, "get_access_token", return_value=None):
+        with unittest.mock.patch.object(self.auth, "get_access_token", return_value=None):
             ret = self.auth.authenticate(self.request)
         self.assertIsNone(ret)
 
@@ -32,7 +32,7 @@ def test_authenticate_raises_authenticationfailed_on_suspiciousoperation(self):
             self.auth.authenticate(self.request)
 
     def test_returns_user_and_token_if_backend_returns_user(self):
-        user = mock.Mock()
+        user = unittest.mock.Mock()
         self.auth.backend.get_or_create_user.return_value = user
         ret = self.auth.authenticate(self.request)
         self.assertEqual(ret[0], user)
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
index ce5e084e..ac1b708f 100644
--- a/tests/test_middleware.py
+++ b/tests/test_middleware.py
@@ -12,7 +12,7 @@
 from django.test import Client, RequestFactory, TestCase, override_settings
 from django.test.client import ClientHandler
 from django.urls import path
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from mozilla_django_oidc.middleware import SessionRefresh
 from mozilla_django_oidc.urls import urlpatterns as orig_urlpatterns
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 5cdc8e35..5a4a740b 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -2,7 +2,7 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase, override_settings
 from django.test.client import RequestFactory
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from mozilla_django_oidc.utils import (
     absolutify,
diff --git a/tests/test_views.py b/tests/test_views.py
index 7d85dd69..d850254d 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -6,7 +6,7 @@
 from django.core.exceptions import SuspiciousOperation
 from django.test import Client, RequestFactory, TestCase, override_settings
 from django.urls import reverse
-from mock import patch
+from unittest.mock import patch
 
 from mozilla_django_oidc import views