Remove pytest-mock dependency

requirements-dev.in

@@ -5,7 +5,6 @@ pip-tools
 pytest
 pytest-cov
 pytest-django
-pytest-mock
 pytest-playwright
 pytest-randomly
 tox
@@ -15,5 +14,6 @@ tox
 # See https://github.com/microsoft/playwright-python/issues/2190
 git+https://github.com/microsoft/playwright-python.git@d9cdfbb1e178b6770625e9f857139aff77516af0#egg=playwright
 
-# coverage 7.6.2 dropped support for Python 3.8, so pinning it for now.
+# These dependencies dropped support for Python 3.8, so pinning them for now.
 coverage[toml]==7.6.1
+pytest-randomly==3.15.0

requirements-dev.txt

@@ -154,7 +154,7 @@ olefile==0.47
     #   opf-fido
 opf-fido @ git+https://github.com/artefactual-labs/fido.git@564ceb8018a8650fe931cf20e6780ee008e60fca
     # via -r requirements.txt
-orjson==3.10.9
+orjson==3.10.10
     # via -r requirements.txt
 packaging==24.1
     # via
@@ -213,7 +213,6 @@ pytest==8.3.3
     #   pytest-base-url
     #   pytest-cov
     #   pytest-django
-    #   pytest-mock
     #   pytest-playwright
     #   pytest-randomly
 pytest-base-url==2.1.0
@@ -222,8 +221,6 @@ pytest-cov==5.0.0
     # via -r requirements-dev.in
 pytest-django==4.9.0
     # via -r requirements-dev.in
-pytest-mock==3.14.0
-    # via -r requirements-dev.in
 pytest-playwright==0.5.2
     # via -r requirements-dev.in
 pytest-randomly==3.15.0
@@ -286,7 +283,7 @@ tomli==2.0.2
     #   pyproject-api
     #   pytest
     #   tox
-tox==4.23.1
+tox==4.23.2
     # via -r requirements-dev.in
 typing-extensions==4.12.2
     # via
@@ -302,7 +299,7 @@ urllib3==2.2.3
     #   amclient
     #   elasticsearch
     #   requests
-virtualenv==20.27.0
+virtualenv==20.27.1
     # via tox
 wheel==0.44.0
     # via pip-tools
@@ -317,13 +314,13 @@ zope-event==5.0
     # via
     #   -r requirements.txt
     #   gevent
-zope-interface==7.1.0
+zope-interface==7.1.1
     # via
     #   -r requirements.txt
     #   gevent
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.2
+pip==24.3.1
     # via pip-tools
 setuptools==75.2.0
     # via

requirements.in

@@ -26,7 +26,6 @@ prometheus_client
 python-dateutil
 requests
 unidecode
-whitenoise
 
 # Required by LDAP authentication
 django-auth-ldap
@@ -42,3 +41,4 @@ mozilla-django-oidc
 django-auth-ldap==5.0.0
 gevent==24.2.1
 jsonschema-specifications==2023.12.1
+whitenoise==6.7.0

requirements.txt

@@ -100,7 +100,7 @@ olefile==0.47
     # via opf-fido
 opf-fido @ git+https://github.com/artefactual-labs/fido.git@564ceb8018a8650fe931cf20e6780ee008e60fca
     # via -r requirements.in
-orjson==3.10.9
+orjson==3.10.10
     # via -r requirements.in
 packaging==24.1
     # via gunicorn
@@ -170,7 +170,7 @@ zipp==3.20.2
     #   importlib-resources
 zope-event==5.0
     # via gevent
-zope-interface==7.1.0
+zope-interface==7.1.1
     # via gevent
 
 # The following packages are considered to be unsafe in a requirements file:

tests/MCPClient/test_antivirus.py

@@ -2,6 +2,7 @@
 
 from collections import OrderedDict
 from collections import namedtuple
+from unittest import mock
 
 import archivematica_clamscan
 import pytest
@@ -79,30 +80,39 @@ def version_attrs(self):
 
 
 def setup_test_scan_file_mocks(
-    mocker,
+    get_scanner,
+    file_already_scanned_mock,
+    file_objects_get,
     file_already_scanned=False,
     file_size=1024,
     scanner_should_except=False,
     scanner_passed=False,
 ):
+    file_already_scanned_mock.return_value = file_already_scanned
+    file_objects_get.return_value = FileMock(size=file_size)
     deps = namedtuple("deps", ["file_already_scanned", "file_get", "scanner"])(
-        file_already_scanned=mocker.patch(
-            "archivematica_clamscan.file_already_scanned",
-            return_value=file_already_scanned,
-        ),
-        file_get=mocker.patch(
-            "main.models.File.objects.get", return_value=FileMock(size=file_size)
-        ),
+        file_already_scanned=file_already_scanned_mock,
+        file_get=file_objects_get,
         scanner=ScannerMock(should_except=scanner_should_except, passed=scanner_passed),
     )
 
-    mocker.patch("archivematica_clamscan.get_scanner", return_value=deps.scanner)
+    get_scanner.return_value = deps.scanner
 
     return deps
 
 
-def test_scan_file_already_scanned(mocker):
-    deps = setup_test_scan_file_mocks(mocker, file_already_scanned=True)
+@mock.patch("archivematica_clamscan.file_already_scanned")
+@mock.patch("main.models.File.objects.get")
+@mock.patch("archivematica_clamscan.get_scanner")
+def test_scan_file_already_scanned(
+    get_scanner, file_objects_get, file_already_scanned_mock
+):
+    deps = setup_test_scan_file_mocks(
+        get_scanner,
+        file_already_scanned_mock,
+        file_objects_get,
+        file_already_scanned=True,
+    )
 
     exit_code = archivematica_clamscan.scan_file([], **dict(args))
 
@@ -160,8 +170,21 @@ def test_scan_file_already_scanned(mocker):
         ),
     ],
 )
-def test_scan_file(mocker, setup_kwargs, exit_code, queue_event_params, settings):
-    setup_test_scan_file_mocks(mocker, **setup_kwargs)
+@mock.patch("archivematica_clamscan.file_already_scanned")
+@mock.patch("main.models.File.objects.get")
+@mock.patch("archivematica_clamscan.get_scanner")
+def test_scan_file(
+    get_scanner,
+    file_objects_get,
+    file_already_scanned_mock,
+    setup_kwargs,
+    exit_code,
+    queue_event_params,
+    settings,
+):
+    setup_test_scan_file_mocks(
+        get_scanner, file_already_scanned_mock, file_objects_get, **setup_kwargs
+    )
 
     # Here the user configurable thresholds for maimum file size, and maximum
     # scan size are being tested. The scan size is offset so as to enable the