From 6ced730b53db0cb561b9a07ef200b92fbca1de38 Mon Sep 17 00:00:00 2001 From: vakarisz Date: Fri, 23 Sep 2022 12:39:08 +0300 Subject: [PATCH] UT: Remove monkey. part from imports in unit tests No part of the codebase import with this longer syntax of `monkey.infection_monkey.something`, because `infection_monkey.something` is shorter and enough --- .../payload/ransomware/test_integrated_ransomware.py | 2 +- .../network/relay/test_relay_connection_handler.py | 2 +- .../infection_monkey/network/relay/test_relay_user_handler.py | 2 +- .../infection_monkey/network/relay/test_sockets_pipe.py | 2 +- .../unit_tests/infection_monkey/telemetry/test_exploit_telem.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monkey/tests/integration_tests/infection_monkey/payload/ransomware/test_integrated_ransomware.py b/monkey/tests/integration_tests/infection_monkey/payload/ransomware/test_integrated_ransomware.py index ced8cf9fd..496793492 100644 --- a/monkey/tests/integration_tests/infection_monkey/payload/ransomware/test_integrated_ransomware.py +++ b/monkey/tests/integration_tests/infection_monkey/payload/ransomware/test_integrated_ransomware.py @@ -4,7 +4,7 @@ from unittest.mock import MagicMock import pytest import infection_monkey.payload.ransomware.ransomware_builder as ransomware_builder -from monkey.common.agent_configuration.default_agent_configuration import RANSOMWARE_OPTIONS +from common.agent_configuration.default_agent_configuration import RANSOMWARE_OPTIONS @pytest.fixture diff --git a/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_connection_handler.py b/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_connection_handler.py index 48f8b6bf5..1ed65d1e0 100644 --- a/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_connection_handler.py +++ b/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_connection_handler.py @@ -4,7 +4,7 @@ from unittest.mock import MagicMock import pytest -from monkey.infection_monkey.network.relay import ( +from infection_monkey.network.relay import ( RELAY_CONTROL_MESSAGE_REMOVE_FROM_WAITLIST, RelayConnectionHandler, RelayUserHandler, diff --git a/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_user_handler.py b/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_user_handler.py index 6f3ecb8fa..2f314b85a 100644 --- a/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_user_handler.py +++ b/monkey/tests/unit_tests/infection_monkey/network/relay/test_relay_user_handler.py @@ -3,7 +3,7 @@ from time import sleep import pytest -from monkey.infection_monkey.network.relay import RelayUserHandler +from infection_monkey.network.relay import RelayUserHandler USER_ADDRESS = IPv4Address("0.0.0.0") diff --git a/monkey/tests/unit_tests/infection_monkey/network/relay/test_sockets_pipe.py b/monkey/tests/unit_tests/infection_monkey/network/relay/test_sockets_pipe.py index 0a98c0247..30b554967 100644 --- a/monkey/tests/unit_tests/infection_monkey/network/relay/test_sockets_pipe.py +++ b/monkey/tests/unit_tests/infection_monkey/network/relay/test_sockets_pipe.py @@ -1,6 +1,6 @@ from unittest.mock import MagicMock -from monkey.infection_monkey.network.relay import SocketsPipe +from infection_monkey.network.relay import SocketsPipe def test_sockets_pipe__name_increments(): diff --git a/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py b/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py index c38c1d130..06e9c183d 100644 --- a/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py +++ b/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py @@ -3,9 +3,9 @@ import json import pytest from infection_monkey.exploit.sshexec import SSHExploiter +from infection_monkey.i_puppet.i_puppet import ExploiterResultData from infection_monkey.model.host import VictimHost from infection_monkey.telemetry.exploit_telem import ExploitTelem -from monkey.infection_monkey.i_puppet.i_puppet import ExploiterResultData DOMAIN_NAME = "domain-name" IP = "0.0.0.0"