Rename clamscan client script

artefactual · Sep 17, 2024 · 5e71df3 · 5e71df3
1 parent da9c499
commit 5e71df3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/MCPClient/lib/archivematicaClientModules b/src/MCPClient/lib/archivematicaClientModules
@@ -23,7 +23,7 @@
 assignfileuuids_v0.0 = assign_file_uuids
 bindpid_v0.0 = bind_pid
 removeunneededfiles_v0.0 = remove_unneeded_files
-archivematicaclamscan_v0.0 = archivematica_clamscan
+antivirus_v0.0 = antivirus
 createevent_v0.0 = create_event
 examinecontents_v0.0 = examine_contents
 identifydspacefiles_v0.0 = identify_dspace_files

diff --git a/...b/clientScripts/archivematica_clamscan.py → src/MCPClient/lib/clientScripts/antivirus.py b/...b/clientScripts/archivematica_clamscan.py → src/MCPClient/lib/clientScripts/antivirus.py
diff --git a/src/MCPServer/lib/assets/workflow.json b/src/MCPServer/lib/assets/workflow.json
@@ -2525,7 +2525,7 @@
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
         "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
-        "execute": "archivematicaClamscan_v0.0",
+        "execute": "antivirus_v0.0",
         "filter_subdir": "objects/submissionDocumentation",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
       },
@@ -2556,7 +2556,7 @@
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
         "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
-        "execute": "archivematicaClamscan_v0.0",
+        "execute": "antivirus_v0.0",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
       },
       "description": {
@@ -2885,7 +2885,7 @@
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
         "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
-        "execute": "archivematicaClamscan_v0.0",
+        "execute": "antivirus_v0.0",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
       },
       "description": {
@@ -6624,7 +6624,7 @@
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
         "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
-        "execute": "archivematicaClamscan_v0.0",
+        "execute": "antivirus_v0.0",
         "filter_subdir": "objects/"
       },
       "description": {
@@ -7203,7 +7203,7 @@
         "@manager": "linkTaskManagerFiles",
         "@model": "StandardTaskConfig",
         "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"",
-        "execute": "archivematicaClamscan_v0.0",
+        "execute": "antivirus_v0.0",
         "filter_subdir": "objects/metadata",
         "stderr_file": "%SIPLogsDirectory%clamAVScan.txt"
       },

diff --git a/tests/MCPClient/test_antivirus.py b/tests/MCPClient/test_antivirus.py
@@ -1,12 +1,12 @@
-"""Tests for the archivematica_clamscan.py client script."""
+"""Tests for the antivirus.py client script."""
 
 from collections import OrderedDict
 from collections import namedtuple
 from unittest import mock
 
 import pytest
-from archivematica_clamscan import create_scanner
-from archivematica_clamscan import scan_file
+from antivirus import create_scanner
+from antivirus import scan_file
 from clamav_client.scanner import ClamdScanner
 from clamav_client.scanner import ClamscanScanner
 from clamav_client.scanner import Scanner
@@ -95,7 +95,7 @@ def setup_test_scan_file_mocks(
 ):
     deps = namedtuple("deps", ["file_already_scanned", "file_get", "scanner"])(
         file_already_scanned=mocker.patch(
-            "archivematica_clamscan.file_already_scanned",
+            "antivirus.file_already_scanned",
             return_value=file_already_scanned,
         ),
         file_get=mocker.patch(
@@ -104,7 +104,7 @@ def setup_test_scan_file_mocks(
         scanner=ScannerMock(should_except=scanner_should_except, passed=scanner_passed),
     )
 
-    mocker.patch("archivematica_clamscan.get_scanner", return_value=deps.scanner)
+    mocker.patch("antivirus.get_scanner", return_value=deps.scanner)
 
     return deps
 
@@ -183,8 +183,8 @@ def test_scan_file(mocker, setup_kwargs, exit_code, queue_event_params, settings
     ret = scan_file(event_queue, **dict(args))
 
     # The integer returned by scan_file() is going to be used as the exit code
-    # of the archivematica_clamscan.py script which is important for the AM
-    # workflow in order to control what to do next.
+    # of the antivirus.py script which is important for the AM workflow in order
+    # to control what to do next.
     assert exit_code == ret
 
     # A side effect of scan_file() is to queue an event to be created in the