From 56c61b1d554b739ccaccdb0558a5cedf81963ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Mon, 11 Apr 2022 15:41:28 +0200 Subject: [PATCH] fixed some other test cases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- planetmint/web/views/base.py | 4 ++-- tests/commands/test_commands.py | 4 ++-- tests/commands/test_utils.py | 1 - tests/web/test_websocket_server.py | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/planetmint/web/views/base.py b/planetmint/web/views/base.py index 62782e9..5d84c59 100644 --- a/planetmint/web/views/base.py +++ b/planetmint/web/views/base.py @@ -9,7 +9,7 @@ import logging from flask import jsonify, request -from planetmint import config +from planetmint.config import Config logger = logging.getLogger(__name__) @@ -37,7 +37,7 @@ def base_ws_uri(): customized (typically when running behind NAT, firewall, etc.) """ - config_wsserver = config['wsserver'] + config_wsserver = Config().get()['wsserver'] scheme = config_wsserver['advertised_scheme'] host = config_wsserver['advertised_host'] diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index d464f1e..8c47bec 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -123,7 +123,7 @@ def test_drop_db_when_interactive_yes(mock_db_drop, monkeypatch): @patch('planetmint.backend.schema.drop_database') def test_drop_db_when_db_does_not_exist(mock_db_drop, capsys): - from planetmint import config + from planetmint.config import Config from planetmint.commands.planetmint import run_drop from planetmint.common.exceptions import DatabaseDoesNotExist args = Namespace(config=None, yes=True) @@ -132,7 +132,7 @@ def test_drop_db_when_db_does_not_exist(mock_db_drop, capsys): run_drop(args) output_message = capsys.readouterr()[1] assert output_message == "Cannot drop '{name}'. The database does not exist.\n".format( - name=config['database']['name']) + name=Config().get()['database']['name']) @patch('planetmint.backend.schema.drop_database') diff --git a/tests/commands/test_utils.py b/tests/commands/test_utils.py index 9f4f852..67c3cee 100644 --- a/tests/commands/test_utils.py +++ b/tests/commands/test_utils.py @@ -85,7 +85,6 @@ def test_configure_planetmint_logging(log_level): args = Namespace(config=None, log_level=log_level) test_configure_logger(args) - from planetmint import config assert config['log']['level_console'] == log_level assert config['log']['level_logfile'] == log_level diff --git a/tests/web/test_websocket_server.py b/tests/web/test_websocket_server.py index f106ec0..54546d9 100644 --- a/tests/web/test_websocket_server.py +++ b/tests/web/test_websocket_server.py @@ -94,7 +94,7 @@ async def test_bridge_sync_async_queue(loop): def test_start_creates_an_event_loop(queue_mock, get_event_loop_mock, init_app_mock, run_app_mock, thread_mock): - from planetmint import config + from planetmint.config import Config from planetmint.web.websocket_server import start, _multiprocessing_to_asyncio start(None) @@ -136,7 +136,7 @@ async def test_websocket_string_event(test_client, loop): await event_source.put(POISON_PILL) -async def test_websocket_block_event(b, test_client, loop): +async def test_websocket_block_event( test_client, loop): from planetmint import events from planetmint.web.websocket_server import init_app, POISON_PILL, EVENTS_ENDPOINT from planetmint.models import Transaction