oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2888: Update tests to use config.fixing_duration.

Browse Source
This commit is contained in:
Nick Todd
2025-01-07 10:27:41 +00:00
parent cb4e10921e
commit d0c357355c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration_tests/configuration_file_parsing/test_software_fixing_duration.py
View File

@@ -13,8 +13,8 @@ from primaite.simulator.system.services.database.database_service import Databas
from primaite.simulator.system.services.dns.dns_client import DNSClient from primaite.simulator.system.services.dns.dns_client import DNSClient
from tests import TEST_ASSETS_ROOT from tests import TEST_ASSETS_ROOT
TEST_CONFIG = TEST_ASSETS_ROOT / "configs/software_fix_duration.yaml" TEST_CONFIG = TEST_ASSETS_ROOT / "configs/software_fixing_duration.yaml"
ONE_ITEM_CONFIG = TEST_ASSETS_ROOT / "configs/fix_duration_one_item.yaml" ONE_ITEM_CONFIG = TEST_ASSETS_ROOT / "configs/fixing_duration_one_item.yaml"
TestApplications = ["DummyApplication", "BroadcastTestClient"] TestApplications = ["DummyApplication", "BroadcastTestClient"]

6
tests/integration_tests/system/test_database_on_node.py
View File

@@ -232,7 +232,7 @@ def test_database_service_fix(uc2_network):
assert db_service.health_state_actual == SoftwareHealthState.FIXING assert db_service.health_state_actual == SoftwareHealthState.FIXING
# apply timestep until the fix is applied # apply timestep until the fix is applied
for i in range(db_service.fixing_duration + 1): for i in range(db_service.config.fixing_duration + 1):
uc2_network.apply_timestep(i) uc2_network.apply_timestep(i)
assert db_service.db_file.health_status == FileSystemItemHealthStatus.GOOD assert db_service.db_file.health_status == FileSystemItemHealthStatus.GOOD
@@ -266,7 +266,7 @@ def test_database_cannot_be_queried_while_fixing(uc2_network):
assert db_connection.query(sql="SELECT") is False assert db_connection.query(sql="SELECT") is False
# apply timestep until the fix is applied # apply timestep until the fix is applied
for i in range(db_service.fixing_duration + 1): for i in range(db_service.config.fixing_duration + 1):
uc2_network.apply_timestep(i) uc2_network.apply_timestep(i)
assert db_service.health_state_actual == SoftwareHealthState.GOOD assert db_service.health_state_actual == SoftwareHealthState.GOOD
@@ -308,7 +308,7 @@ def test_database_can_create_connection_while_fixing(uc2_network):
assert new_db_connection.query(sql="SELECT") is False # still should fail to query because FIXING assert new_db_connection.query(sql="SELECT") is False # still should fail to query because FIXING
# apply timestep until the fix is applied # apply timestep until the fix is applied
for i in range(db_service.fixing_duration + 1): for i in range(db_service.config.fixing_duration + 1):
uc2_network.apply_timestep(i) uc2_network.apply_timestep(i)
assert db_service.health_state_actual == SoftwareHealthState.GOOD assert db_service.health_state_actual == SoftwareHealthState.GOOD

2
tests/integration_tests/system/test_web_client_server_and_database.py
View File

@@ -131,7 +131,7 @@ def test_database_fix_disrupts_web_client(uc2_network):
assert web_browser.get_webpage() is False assert web_browser.get_webpage() is False
for i in range(database_service.fixing_duration + 1): for i in range(database_service.config.fixing_duration + 1):
uc2_network.apply_timestep(i) uc2_network.apply_timestep(i)
assert database_service.health_state_actual == SoftwareHealthState.GOOD assert database_service.health_state_actual == SoftwareHealthState.GOOD

2
tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py
View File

@@ -148,7 +148,7 @@ def test_service_fixing(service):
service.fix() service.fix()
assert service.health_state_actual == SoftwareHealthState.FIXING assert service.health_state_actual == SoftwareHealthState.FIXING
for i in range(service.fixing_duration + 1): for i in range(service.config.fixing_duration + 1):
service.apply_timestep(i) service.apply_timestep(i)
assert service.health_state_actual == SoftwareHealthState.GOOD assert service.health_state_actual == SoftwareHealthState.GOOD