From 7f447c30d9a0c09492ef4ac930b87cb6d686e877 Mon Sep 17 00:00:00 2001 From: Robert Betts Date: Sat, 14 Oct 2023 23:52:19 +0100 Subject: [PATCH] commented out local dev debug settings --- poetry.lock | 4 ++-- pyproject.toml | 6 +++--- tests/conftest.py | 2 -- tests/test_nuropb_api.py | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index d8581e5..b495225 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "aiohttp" @@ -3721,4 +3721,4 @@ docs = [] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "07e41c2f66c37b647a6d4c45158259f24b249c60c4d489dc28f98408800707e0" +content-hash = "4cb94599570ba60ecaa704cb7044bb0663d86c9ca0111ac57454203f88a98028" diff --git a/pyproject.toml b/pyproject.toml index 3043008..5203864 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ poetry = "^1.5.1" pytest = "^7.3.1" certifi = "^2023.7.22" coverage = {extras = ["toml"], version = "^7.2.7"} -pytest-dotenv = "^0.5.2" +pytest-dotenv = "0.5.2" black = "^23.3.0" mypy = "^1.4.1" pytest-asyncio = "^0.21.1" @@ -67,10 +67,10 @@ requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" [tool.pytest] -env_files = [".env_test"] -testpaths = ["tests"] [tool.pytest.ini_options] +env_files = [".env"] +testpaths = ["tests"] asyncio_mode = "strict" log_cli = true log_level = "DEBUG" diff --git a/tests/conftest.py b/tests/conftest.py index 6da2026..f9a2130 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -45,8 +45,6 @@ def test_settings(): logger.info(os.environ) api_port = os.environ.get("RMQ_API_PORT", "15672") amqp_port = os.environ.get("RMQ_AMQP_PORT", "5672") - # api_port = "15673" - # amqp_port = "5673" yield { "api_scheme": "http", diff --git a/tests/test_nuropb_api.py b/tests/test_nuropb_api.py index 087bcea..e43d93a 100644 --- a/tests/test_nuropb_api.py +++ b/tests/test_nuropb_api.py @@ -28,6 +28,8 @@ async def test_client_and_service_api_quick_setup(test_settings, rmq_settings): client_api = create_client( connection_properties={ "vhost": connection_properties["vhost"], + "port": rmq_settings["port"], + "host": rmq_settings["host"], } ) await client_api.connect() @@ -44,17 +46,20 @@ async def test_client_and_service_api_quick_setup_raw_defaults(rmq_settings): configure_mesh( connection_properties={ "port": rmq_settings["port"], + "host": rmq_settings["host"], } ) service_api = create_service( name="test_service", connection_properties={ "port": rmq_settings["port"], + "host": rmq_settings["host"], } ) await service_api.connect() client_api = create_client(connection_properties={ "port": rmq_settings["port"], + "host": rmq_settings["host"], }) await client_api.connect()