Fix linting errors & update existing unit tests

ral-facilities · Apr 11, 2023 · fb3d05a · fb3d05a
1 parent 49632ea
commit fb3d05a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/datagateway_api/src/main.py b/datagateway_api/src/main.py
@@ -1,6 +1,8 @@
 import logging
 
 from flask import Flask
+from werkzeug.middleware.dispatcher import DispatcherMiddleware
+from werkzeug.wrappers import Response
 
 from datagateway_api.src.api_start_utils import (
     create_api_endpoints,
@@ -9,8 +11,7 @@
 )
 from datagateway_api.src.common.config import Config
 from datagateway_api.src.common.logger_setup import setup_logger
-from werkzeug.middleware.dispatcher import DispatcherMiddleware
-from werkzeug.wrappers import Response
+
 
 setup_logger()
 log = logging.getLogger()
@@ -24,8 +25,7 @@
 
 if __name__ == "__main__":
     app.wsgi_app = DispatcherMiddleware(
-        Response('Not Found', status=404),
-        {Config.config.url_prefix: app.wsgi_app}
+        Response("Not Found", status=404), {Config.config.url_prefix: app.wsgi_app},
     )
     app.run(
         host=Config.config.host,

diff --git a/test/conftest.py b/test/conftest.py
@@ -59,6 +59,7 @@ def test_config_data():
         "port": "5000",
         "test_user_credentials": {"username": "root", "password": "pw"},
         "test_mechanism": "simple",
+        "url_prefix": "",
     }
 
 

diff --git a/test/unit/test_config.py b/test/unit/test_config.py
@@ -60,7 +60,7 @@ def test_load_with_same_api_extensions(self, test_config_data):
     @pytest.mark.parametrize(
         "input_extension, expected_extension",
         [
-            pytest.param("/", "/", id="Slash"),
+            pytest.param("/", "", id="Slash"),
             pytest.param("", "", id="Empty string, implied slash"),
             pytest.param("/datagateway-api", "/datagateway-api", id="DataGateway API"),
             pytest.param(