From 124b8dd227b73148f6ccba1c7b180de8ff5a5e5e Mon Sep 17 00:00:00 2001
From: Lorenz Herzberger <lorenzherzberger@gmail.com>
Date: Wed, 22 Jun 2022 10:13:02 +0200
Subject: [PATCH] adjusted connect config error handling and test case for new
 signature

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
---
 planetmint/backend/connection.py | 23 ++++++++++++-----------
 tests/backend/test_connection.py |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/planetmint/backend/connection.py b/planetmint/backend/connection.py
index e764cfd..5cbca15 100644
--- a/planetmint/backend/connection.py
+++ b/planetmint/backend/connection.py
@@ -12,7 +12,7 @@ from planetmint.config import Config
 from planetmint.backend.exceptions import ConnectionError
 from planetmint.transactions.common.exceptions import ConfigurationError
 
-BACKENDS = {  # This is path to MongoDBClass
+BACKENDS = {
     'tarantool_db': 'planetmint.backend.tarantool.connection.TarantoolDBConnection',
     'localmongodb': 'planetmint.backend.localmongodb.connection.LocalMongoDBConnection'
 }
@@ -22,14 +22,18 @@ logger = logging.getLogger(__name__)
 
 def connect(host: str = None, port: int = None, login: str = None, password: str = None, backend: str = None,
                **kwargs):
-    backend = backend
-    if not backend and kwargs and kwargs.get("backend"):
-        backend = kwargs["backend"]
+    try:
+        backend = backend
+        if not backend and kwargs and kwargs.get("backend"):
+            backend = kwargs["backend"]
 
-    if backend and backend != Config().get()["database"]["backend"]:
-        Config().init_config(backend)
-    else:
-        backend = Config().get()["database"]["backend"]
+        if backend and backend != Config().get()["database"]["backend"]:
+            Config().init_config(backend)
+        else:
+            backend = Config().get()["database"]["backend"]
+    except KeyError:
+        logger.info("Backend {} not supported".format(backend))
+        raise ConfigurationError
 
     host = host or Config().get()["database"]["host"] if not kwargs.get("host") else kwargs["host"]
     port = port or Config().get()['database']['port'] if not kwargs.get("port") else kwargs["port"]
@@ -72,9 +76,6 @@ def connect(host: str = None, port: int = None, login: str = None, password: str
     except tarantool.error.NetworkError as network_err:
         print(f"Host {host}:{port} can't be reached.\n{network_err}")
         raise network_err
-    except:
-        logger.info('Exception in _connect(): {}')
-        raise ConfigurationError
 
 
 def _kwargs_parser(key, kwargs):
diff --git a/tests/backend/test_connection.py b/tests/backend/test_connection.py
index 4da59c3..e2d8a85 100644
--- a/tests/backend/test_connection.py
+++ b/tests/backend/test_connection.py
@@ -10,7 +10,7 @@ def test_get_connection_raises_a_configuration_error(monkeypatch):
     from planetmint.transactions.common.exceptions import ConfigurationError
     from planetmint.backend.connection import connect
     with pytest.raises(ConfigurationError):
-        connect('msaccess', 'localhost', '1337', 'mydb')
+        connect('localhost', '1337', 'mydb', 'password', 'msaccess')
 
     with pytest.raises(ConfigurationError):
         # We need to force a misconfiguration here
@@ -18,4 +18,4 @@ def test_get_connection_raises_a_configuration_error(monkeypatch):
                             {'catsandra':
                              'planetmint.backend.meowmeow.Catsandra'})
 
-        connect('catsandra', 'localhost', '1337', 'mydb')
+        connect('localhost', '1337', 'mydb', 'password', 'catsandra')