#2887 - Merge in changes on dev to resolve conflicts. All tests should now pass

tests/integration_tests/configuration_file_parsing/software_installation_and_configuration.py

@@ -201,7 +201,6 @@ def test_ftp_server_install():
 
     ftp_server_service: FTPServer = client_1.software_manager.software.get("FTPServer")
     assert ftp_server_service is not None
-    assert ftp_server_service.server_password == "arcd"
 
 
 def test_ntp_client_install():

tests/integration_tests/game_layer/actions/test_node_request_permission.py

@@ -25,6 +25,7 @@ def test_node_startup_shutdown(game_and_agent_fixture: Tuple[PrimaiteGame, Proxy
     game, agent = game_and_agent_fixture
 
     client_1 = game.simulation.network.get_node_by_hostname("client_1")
+    client_1.config.shut_down_duration = 3
 
     assert client_1.operating_state == NodeOperatingState.ON
 
@@ -42,6 +43,8 @@ def test_node_startup_shutdown(game_and_agent_fixture: Tuple[PrimaiteGame, Proxy
 
     assert client_1.operating_state == NodeOperatingState.OFF
 
+    client_1.config.start_up_duration = 3
+
     # turn it on
     action = ("node_startup", {"node_name": "client_1"})
     agent.store_action(action)

tests/integration_tests/system/red_applications/test_c2_suite_integration.py

@@ -185,8 +185,8 @@ def test_c2_suite_configure_request(basic_network):
     c2_beacon_config = {
         "c2_server_ip_address": "192.168.0.2",
         "keep_alive_frequency": 5,
-        "masquerade_protocol": "TCP",
-        "masquerade_port": "HTTP",
+        "masquerade_protocol": "tcp",
+        "masquerade_port": 80,
     }
 
     network.apply_request(["node", "node_b", "application", "C2Beacon", "configure", c2_beacon_config])