From f8134e505e84c03052a48b7186218774593701e8 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Fri, 16 Sep 2022 18:18:40 +0530 Subject: [PATCH] UT: Fix imports common.events -> common.agent_events --- .../test_agent_event_serializer_registry.py | 2 +- .../test_pydantic_agent_event_serializer.py | 2 +- .../common/event_queue/test_pypubsub_agent_event_queue.py | 2 +- .../credential_collectors/test_mimikatz_collector.py | 2 +- .../credential_store/test_add_credentials_from_event.py | 2 +- .../monkey_island/cc/repository/test_mongo_event_repository.py | 2 +- .../tests/unit_tests/monkey_island/cc/resources/test_events.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monkey/tests/unit_tests/common/agent_event_serializers/test_agent_event_serializer_registry.py b/monkey/tests/unit_tests/common/agent_event_serializers/test_agent_event_serializer_registry.py index 892a8ccb8..b45385ed4 100644 --- a/monkey/tests/unit_tests/common/agent_event_serializers/test_agent_event_serializer_registry.py +++ b/monkey/tests/unit_tests/common/agent_event_serializers/test_agent_event_serializer_registry.py @@ -4,7 +4,7 @@ import pytest from pydantic import Field from common.agent_event_serializers import AgentEventSerializerRegistry, IAgentEventSerializer -from common.events import AbstractAgentEvent +from common.agent_events import AbstractAgentEvent class SomeEvent(AbstractAgentEvent): diff --git a/monkey/tests/unit_tests/common/agent_event_serializers/test_pydantic_agent_event_serializer.py b/monkey/tests/unit_tests/common/agent_event_serializers/test_pydantic_agent_event_serializer.py index 31e75ab46..f06f7b182 100644 --- a/monkey/tests/unit_tests/common/agent_event_serializers/test_pydantic_agent_event_serializer.py +++ b/monkey/tests/unit_tests/common/agent_event_serializers/test_pydantic_agent_event_serializer.py @@ -10,7 +10,7 @@ from common.agent_event_serializers import ( IAgentEventSerializer, PydanticAgentEventSerializer, ) -from common.events import AbstractAgentEvent +from common.agent_events import AbstractAgentEvent AGENT_ID = UUID("f811ad00-5a68-4437-bd51-7b5cc1768ad5") diff --git a/monkey/tests/unit_tests/common/event_queue/test_pypubsub_agent_event_queue.py b/monkey/tests/unit_tests/common/event_queue/test_pypubsub_agent_event_queue.py index 891fa445f..bad50892e 100644 --- a/monkey/tests/unit_tests/common/event_queue/test_pypubsub_agent_event_queue.py +++ b/monkey/tests/unit_tests/common/event_queue/test_pypubsub_agent_event_queue.py @@ -5,8 +5,8 @@ from uuid import UUID import pytest from pubsub.core import Publisher +from common.agent_events import AbstractAgentEvent from common.event_queue import AgentEventSubscriber, IAgentEventQueue, PyPubSubAgentEventQueue -from common.events import AbstractAgentEvent EVENT_TAG_1 = "event tag 1" EVENT_TAG_2 = "event tag 2" diff --git a/monkey/tests/unit_tests/infection_monkey/credential_collectors/test_mimikatz_collector.py b/monkey/tests/unit_tests/infection_monkey/credential_collectors/test_mimikatz_collector.py index 11c6d695b..38292ea9b 100644 --- a/monkey/tests/unit_tests/infection_monkey/credential_collectors/test_mimikatz_collector.py +++ b/monkey/tests/unit_tests/infection_monkey/credential_collectors/test_mimikatz_collector.py @@ -3,9 +3,9 @@ from unittest.mock import MagicMock import pytest +from common.agent_events import CredentialsStolenEvent from common.credentials import Credentials, LMHash, NTHash, Password, Username from common.event_queue import IAgentEventQueue -from common.events import CredentialsStolenEvent from infection_monkey.credential_collectors import MimikatzCredentialCollector from infection_monkey.credential_collectors.mimikatz_collector.mimikatz_credential_collector import ( # noqa: E501 MIMIKATZ_EVENT_TAGS, diff --git a/monkey/tests/unit_tests/infection_monkey/credential_store/test_add_credentials_from_event.py b/monkey/tests/unit_tests/infection_monkey/credential_store/test_add_credentials_from_event.py index 26f4f6a50..5327603fe 100644 --- a/monkey/tests/unit_tests/infection_monkey/credential_store/test_add_credentials_from_event.py +++ b/monkey/tests/unit_tests/infection_monkey/credential_store/test_add_credentials_from_event.py @@ -1,8 +1,8 @@ from unittest.mock import MagicMock from uuid import UUID +from common.agent_events import CredentialsStolenEvent from common.credentials import Credentials, Password, Username -from common.events import CredentialsStolenEvent from infection_monkey.credential_repository import ( IPropagationCredentialsRepository, add_credentials_from_event_to_propagation_credentials_repository, diff --git a/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py b/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py index 7737e3cd7..99a780b3d 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py +++ b/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py @@ -10,7 +10,7 @@ from common.agent_event_serializers import ( AgentEventSerializerRegistry, PydanticAgentEventSerializer, ) -from common.events import AbstractAgentEvent +from common.agent_events import AbstractAgentEvent from monkey_island.cc.repository import ( IAgentEventRepository, MongoEventRepository, diff --git a/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py b/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py index ce8b27bb9..2ae8315fa 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py +++ b/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py @@ -9,8 +9,8 @@ from common.agent_event_serializers import ( AgentEventSerializerRegistry, PydanticAgentEventSerializer, ) +from common.agent_events import AbstractAgentEvent from common.event_queue import IAgentEventQueue -from common.events import AbstractAgentEvent from monkey_island.cc.resources import AgentEvents EVENTS_URL = AgentEvents.urls[0]