#1961: scanning no longer happens every timestep - the scan is all done in one timestep after the required timestep countdown is complete

tests/unit_tests/_primaite/_simulator/_file_system/test_file_system.py

@@ -215,8 +215,8 @@ def test_folder_scan(file_system):
     folder.apply_timestep(timestep=0)
 
     assert folder.health_status == FileSystemItemHealthStatus.CORRUPT
-    assert folder.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-    assert file1.visible_health_status == FileSystemItemHealthStatus.CORRUPT
+    assert folder.visible_health_status == FileSystemItemHealthStatus.GOOD
+    assert file1.visible_health_status == FileSystemItemHealthStatus.GOOD
     assert file2.visible_health_status == FileSystemItemHealthStatus.GOOD
 
     folder.apply_timestep(timestep=1)
@@ -226,12 +226,33 @@ def test_folder_scan(file_system):
     assert file1.visible_health_status == FileSystemItemHealthStatus.CORRUPT
     assert file2.visible_health_status == FileSystemItemHealthStatus.CORRUPT
 
-    folder.apply_timestep(timestep=2)
 
-    assert folder.health_status == FileSystemItemHealthStatus.CORRUPT
-    assert folder.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-    assert file1.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-    assert file2.visible_health_status == FileSystemItemHealthStatus.CORRUPT
+def test_folder_reveal_to_red_scan(file_system):
+    """Test the ability to reveal files to red."""
+    folder: Folder = file_system.create_folder(folder_name="test_folder")
+    file_system.create_file(file_name="test_file.txt", folder_name="test_folder")
+    file_system.create_file(file_name="test_file2.txt", folder_name="test_folder")
+
+    file1: File = folder.get_file_by_id(file_uuid=list(folder.files)[1])
+    file2: File = folder.get_file_by_id(file_uuid=list(folder.files)[0])
+
+    assert folder.revealed_to_red is False
+    assert file1.revealed_to_red is False
+    assert file2.revealed_to_red is False
+
+    folder.reveal_to_red()
+
+    folder.apply_timestep(timestep=0)
+
+    assert folder.revealed_to_red is False
+    assert file1.revealed_to_red is False
+    assert file2.revealed_to_red is False
+
+    folder.apply_timestep(timestep=1)
+
+    assert folder.revealed_to_red is True
+    assert file1.revealed_to_red is True
+    assert file2.revealed_to_red is True
 
 
 def test_simulated_file_check_hash(file_system):

tests/unit_tests/_primaite/_simulator/_file_system/test_file_system_actions.py

@@ -47,8 +47,8 @@ def test_folder_scan_request(populated_file_system):
     folder.apply_timestep(timestep=0)
 
     assert folder.health_status == FileSystemItemHealthStatus.CORRUPT
-    assert folder.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-    assert file1.visible_health_status == FileSystemItemHealthStatus.CORRUPT
+    assert folder.visible_health_status == FileSystemItemHealthStatus.GOOD
+    assert file1.visible_health_status == FileSystemItemHealthStatus.GOOD
     assert file2.visible_health_status == FileSystemItemHealthStatus.GOOD
 
     folder.apply_timestep(timestep=1)
@@ -58,13 +58,6 @@ def test_folder_scan_request(populated_file_system):
     assert file1.visible_health_status == FileSystemItemHealthStatus.CORRUPT
     assert file2.visible_health_status == FileSystemItemHealthStatus.CORRUPT
 
-    folder.apply_timestep(timestep=2)
-
-    assert folder.health_status == FileSystemItemHealthStatus.CORRUPT
-    assert folder.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-    assert file1.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-    assert file2.visible_health_status == FileSystemItemHealthStatus.CORRUPT
-
 
 def test_file_checkhash_request(populated_file_system):
     """Test that an agent can request a file hash check."""

tests/unit_tests/_primaite/_simulator/_network/_hardware/test_node_actions.py

@@ -69,14 +69,16 @@ def test_node_os_scan(node, service, application):
     assert folder.visible_health_status == FileSystemItemHealthStatus.GOOD
 
     file: File = node.file_system.create_file(folder_name="test_folder", file_name="file.txt")
+    file2: File = node.file_system.create_file(folder_name="test_folder", file_name="file2.txt")
     file.corrupt()
+    file2.corrupt()
     assert file.visible_health_status == FileSystemItemHealthStatus.GOOD
 
     # run os scan
     node.apply_request(["os", "scan"])
 
     # apply time steps
-    for i in range(20):
+    for i in range(10):
         node.apply_timestep(timestep=i)
 
     # should update the state of all items
@@ -85,6 +87,7 @@ def test_node_os_scan(node, service, application):
     assert application.health_state_visible == SoftwareHealthState.COMPROMISED
     assert folder.visible_health_status == FileSystemItemHealthStatus.CORRUPT
     assert file.visible_health_status == FileSystemItemHealthStatus.CORRUPT
+    assert file2.visible_health_status == FileSystemItemHealthStatus.CORRUPT
 
 
 def test_node_red_scan(node, service, application):
@@ -108,13 +111,15 @@ def test_node_red_scan(node, service, application):
     assert folder.revealed_to_red is False
 
     file: File = node.file_system.create_file(folder_name="test_folder", file_name="file.txt")
+    file2: File = node.file_system.create_file(folder_name="test_folder", file_name="file2.txt")
     assert file.revealed_to_red is False
+    assert file2.revealed_to_red is False
 
     # run os scan
     node.apply_request(["scan"])
 
     # apply time steps
-    for i in range(20):
+    for i in range(10):
         node.apply_timestep(timestep=i)
 
     # should update the state of all items
@@ -123,6 +128,7 @@ def test_node_red_scan(node, service, application):
     assert application.revealed_to_red is True
     assert folder.revealed_to_red is True
     assert file.revealed_to_red is True
+    assert file2.revealed_to_red is True
 
 
 def test_reset_node(node):