Pull request #32: restructuring: moved test out of module scope

Merge in RR/pyinfra from partial_responses to master

Squashed commit of the following:

commit afd67d87a6349c4b97453a12274c6ccf5e976339
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Tue Apr 26 12:48:12 2022 +0200

    updated test container dockerfile for new location of tests directory

commit 37881da08ebedf0f2d0c6c2b267bdb47818a0da1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Tue Apr 26 12:45:12 2022 +0200

    restructuring: moved test out  of module scope

Dockerfile_tests

@@ -16,4 +16,4 @@ COPY . .
 RUN python3 -m pip install -e .
 RUN python3 -m pip install -r requirements.txt
 
-CMD coverage run -m pytest pyinfra/test/ -x && coverage report -m && coverage xml
+CMD coverage run -m pytest test/ -x && coverage report -m && coverage xml

pyinfra/locations.py

@@ -7,7 +7,7 @@ MODULE_DIR = Path(__file__).resolve().parents[0]
 
 PACKAGE_ROOT_DIR = MODULE_DIR.parents[0]
 
-TEST_DIR = MODULE_DIR / "test"
+TEST_DIR = PACKAGE_ROOT_DIR / "test"
 
 CONFIG_FILE = PACKAGE_ROOT_DIR / "config.yaml"
 

test/queue/queue_manager_mock.py

@@ -1,5 +1,5 @@
 from pyinfra.queue.queue_manager.queue_manager import QueueManager, QueueHandle
-from pyinfra.test.queue.queue_mock import QueueMock
+from test.queue.queue_mock import QueueMock
 
 
 def monkey_patch_queue_handle(queue) -> QueueHandle:

test/storage/adapter_mock.py

@@ -1,5 +1,5 @@
 from pyinfra.storage.adapters.adapter import StorageAdapter
-from pyinfra.test.storage.client_mock import StorageClientMock
+from test.storage.client_mock import StorageClientMock
 
 
 class StorageAdapterMock(StorageAdapter):

test/unit_tests/azure_adapter_test.py

@@ -1,7 +1,7 @@
 import pytest
 
 from pyinfra.storage.adapters.azure import AzureStorageAdapter
-from pyinfra.test.storage.client_mock import StorageClientMock
+from test.storage.client_mock import StorageClientMock
 
 
 @pytest.fixture

test/unit_tests/conftest.py

@@ -16,10 +16,10 @@ from pyinfra.storage.adapters.s3 import S3StorageAdapter
 from pyinfra.storage.clients.azure import get_azure_client
 from pyinfra.storage.clients.s3 import get_s3_client
 from pyinfra.storage.storage import Storage
-from pyinfra.test.config import CONFIG
-from pyinfra.test.queue.queue_manager_mock import QueueManagerMock
-from pyinfra.test.storage.adapter_mock import StorageAdapterMock
-from pyinfra.test.storage.client_mock import StorageClientMock
+from test.config import CONFIG
+from test.queue.queue_manager_mock import QueueManagerMock
+from test.storage.adapter_mock import StorageAdapterMock
+from test.storage.client_mock import StorageClientMock
 from pyinfra.visitor import StorageStrategy, ForwardingStrategy, QueueVisitor
 
 logger = logging.getLogger(__name__)