From 93b8edadf76373867c5b14d50dc7a515e359da41 Mon Sep 17 00:00:00 2001 From: Thorsten Sick Date: Tue, 20 Apr 2021 08:35:51 +0200 Subject: [PATCH] Fixed caldera startup unit test --- app/machinecontrol.py | 3 +-- tests/test_machinecontrol.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/machinecontrol.py b/app/machinecontrol.py index 19d87b1..25d9585 100644 --- a/app/machinecontrol.py +++ b/app/machinecontrol.py @@ -442,8 +442,7 @@ class Machine(): playground = self.vm_manager.get_playground() if self.get_os() == "linux": - cmd = f"""chmod +x caldera_agent.sh; -nohup bash {playground}/caldera_agent.sh start & + cmd = f"""chmod +x caldera_agent.sh; nohup bash {playground}/caldera_agent.sh start & """ elif self.get_os() == "windows": if playground: diff --git a/tests/test_machinecontrol.py b/tests/test_machinecontrol.py index cbd37b7..ec8f17e 100644 --- a/tests/test_machinecontrol.py +++ b/tests/test_machinecontrol.py @@ -233,7 +233,7 @@ class TestMachineControl(unittest.TestCase): m.set_caldera_server("http://www.test.test") with patch.object(m.vm_manager, "get_playground", return_value="/vagrant/target3"): cmd = m.create_start_caldera_client_cmd() - self.assertEqual(cmd.strip(), "nohup /vagrant/target3/caldera_agent.sh start &".strip()) + self.assertEqual(cmd.strip(), "chmod +x caldera_agent.sh; nohup bash /vagrant/target3/caldera_agent.sh start &".strip()) # Create caldera start command and verify it (windows) def test_get_windows_caldera_start_cmd(self):