blah

Cisco-Talos · Oct 14, 2022 · 62c81ee · 62c81ee
1 parent 451cc25
commit 62c81ee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
@@ -165,7 +165,7 @@ target_compile_definitions(check_clamav PUBLIC OBJDIR="${OBJDIR}" SRCDIR="${SRCD
 ADD_CUSTOM_COMMAND(TARGET check_clamav POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/input/clamav.hdb ${CMAKE_CURRENT_BINARY_DIR}/input/.)
 ADD_CUSTOM_COMMAND(TARGET check_clamav POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/input/clamav.other.hdb ${CMAKE_CURRENT_BINARY_DIR}/input/.)
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/input/clamav.vs.hdb ${CMAKE_CURRENT_BINARY_DIR}/input/.)
 
 #
 # Paths to pass to our tests via environment variables

diff --git a/unit_tests/clamscan_test.py b/unit_tests/clamscan_test.py
@@ -37,7 +37,7 @@ def setUpClass(cls):
         )
 
         shutil.copy(
-            str(TC.path_build / 'unit_tests' / 'input' / 'clamav.other.hdb'),
+            str(TC.path_build / 'unit_tests' / 'input' / 'clamav.vs.hdb'),
             str(TC.path_db),
         )
 
@@ -793,14 +793,14 @@ def test_clamscan_19_velvetsweatshop_detection(self):
         testfiles = ' '.join([str(testpath) for testpath in vsTestPaths])
 
         command = '{valgrind} {valgrind_args} {clamscan} -d {path_db} {testfiles}'.format(
-            valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, clamscan=TC.clamscan, path_db=TC.path_db / "clamav.other.hdb", testfiles=testfiles,
+            valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, clamscan=TC.clamscan, path_db=TC.path_db / "clamav.vs.hdb", testfiles=testfiles,
         )
 
         output = self.execute_command(command)
 
         assert output.ec == 1  # virus found
 
-        expected_results = ['{}: ClamAV-Test-File2.UNOFFICIAL FOUND'.format(testpath.name) for testpath in vsTestPaths]
+        expected_results = ['{}: ClamAV-VelvetSweatshop-Test-File2.UNOFFICIAL FOUND'.format(testpath.name) for testpath in vsTestPaths]
         expected_results.append('Scanned files: {}'.format(len(vsTestPaths)))
         expected_results.append('Infected files: {}'.format(len(vsTestPaths)))
 

diff --git a/unit_tests/input/clamav.other.hdb b/unit_tests/input/clamav.other.hdb
diff --git a/unit_tests/input/clamav.vs.hdb b/unit_tests/input/clamav.vs.hdb
@@ -0,0 +1 @@
+a7acff7aba1a40f293b17f06eac1a8288c0d706d:74436:ClamAV-VelvetSweatshop-Test-File2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		a7acff7aba1a40f293b17f06eac1a8288c0d706d:74436:ClamAV-VelvetSweatshop-Test-File2