p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BB tests: removed island connectivity test. Now the connection is tested in fixture and if anything goes wrong tests are not launched

This commit is contained in:
VakarisZ 2021-05-20 08:44:12 +03:00
parent 488143b1d3
commit af049b468b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
envs/monkey_zoo/blackbox/test_blackbox.py
View File

@ -98,7 +98,15 @@ def wait_machine_bootup():
@pytest.fixture(scope="class") @pytest.fixture(scope="class")
def island_client(island, quick_performance_tests): def island_client(island, quick_performance_tests):
island_client_object = MonkeyIslandClient(island) client_established = False
try:
island_client_object = MonkeyIslandClient(island)
client_established = island_client_object.get_api_status()
except Exception:
logging.exception("message")
finally:
if not client_established:
pytest.exit("BB tests couldn't establish communication to the island.")
if not quick_performance_tests: if not quick_performance_tests:
island_client_object.reset_env() island_client_object.reset_env()
yield island_client_object yield island_client_object
@ -158,10 +166,6 @@ class TestMonkeyBlackbox:
def get_log_dir_path(): def get_log_dir_path():
return os.path.abspath(LOG_DIR_PATH) return os.path.abspath(LOG_DIR_PATH)
def test_server_online(self, island_client):
if not island_client.get_api_status():
pytest.exit("BB tests couldn't reach the Island server, quiting.")
def test_ssh_exploiter(self, island_client): def test_ssh_exploiter(self, island_client):
TestMonkeyBlackbox.run_exploitation_test(island_client, Ssh, "SSH_exploiter_and_keys") TestMonkeyBlackbox.run_exploitation_test(island_client, Ssh, "SSH_exploiter_and_keys")