Fix warnings from tests

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

tests/conftest.py

@@ -441,7 +441,7 @@ def get_uri(self):
         return 'mongodb://localhost:{port!s}'.format(port=self.port)
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def mongodb_instance():
     tmp_db = MongoTemporaryInstance()
     yield tmp_db

tests/flows/test_account_linking.py

@@ -1,6 +1,6 @@
 import responses
 from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
+from werkzeug.wrappers import Response
 
 from satosa.proxy_server import make_app
 from satosa.satosa_config import SATOSAConfig
@@ -15,7 +15,7 @@ def test_full_flow(self, satosa_config_dict, account_linking_module_config):
         satosa_config_dict["MICRO_SERVICES"].insert(0, account_linking_module_config)
 
         # application
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         # incoming auth req
         http_resp = test_client.get("/{}/{}/request".format(satosa_config_dict["BACKEND_MODULES"][0]["name"],

tests/flows/test_consent.py

@@ -3,7 +3,7 @@
 
 import responses
 from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
+from werkzeug.wrappers import Response
 
 from satosa.proxy_server import make_app
 from satosa.satosa_config import SATOSAConfig
@@ -18,7 +18,7 @@ def test_full_flow(self, satosa_config_dict, consent_module_config):
         satosa_config_dict["MICRO_SERVICES"].append(consent_module_config)
 
         # application
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         # incoming auth req
         http_resp = test_client.get("/{}/{}/request".format(satosa_config_dict["BACKEND_MODULES"][0]["name"],

tests/flows/test_oidc-saml.py

@@ -9,7 +9,7 @@
 from saml2 import BINDING_HTTP_REDIRECT
 from saml2.config import IdPConfig
 from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
+from werkzeug.wrappers import Response
 
 from satosa.metadata_creation.saml_metadata import create_entity_descriptors
 from satosa.proxy_server import make_app
@@ -60,7 +60,7 @@ def test_full_flow(self, satosa_config_dict, oidc_frontend_config, saml_backend_
         _, backend_metadata = create_entity_descriptors(SATOSAConfig(satosa_config_dict))
 
         # application
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         # get frontend OP config info
         provider_config = json.loads(test_client.get("/.well-known/openid-configuration").data.decode("utf-8"))

tests/flows/test_saml-oidc.py

@@ -5,7 +5,7 @@
 from saml2 import BINDING_HTTP_REDIRECT
 from saml2.config import SPConfig
 from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
+from werkzeug.wrappers import Response
 
 from satosa.metadata_creation.saml_metadata import create_entity_descriptors
 from satosa.proxy_server import make_app
@@ -27,7 +27,7 @@ def run_test(self, satosa_config_dict, sp_conf, oidc_backend_config, frontend_co
         frontend_metadata, backend_metadata = create_entity_descriptors(SATOSAConfig(satosa_config_dict))
 
         # application
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         # config test SP
         frontend_metadata_str = str(frontend_metadata[frontend_config["name"]][0])

tests/flows/test_saml-saml.py

@@ -3,7 +3,7 @@
 from saml2 import BINDING_HTTP_REDIRECT
 from saml2.config import SPConfig, IdPConfig
 from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
+from werkzeug.wrappers import Response
 
 from satosa.metadata_creation.saml_metadata import create_entity_descriptors
 from satosa.proxy_server import make_app
@@ -23,7 +23,7 @@ def run_test(self, satosa_config_dict, sp_conf, idp_conf, saml_backend_config, f
         frontend_metadata, backend_metadata = create_entity_descriptors(SATOSAConfig(satosa_config_dict))
 
         # application
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         # config test SP
         frontend_metadata_str = str(frontend_metadata[frontend_config["name"]][0])

tests/flows/test_wsgi_flow.py

@@ -4,7 +4,7 @@
 import json
 
 from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
+from werkzeug.wrappers import Response
 
 from satosa.proxy_server import make_app
 from satosa.response import NotFound
@@ -21,7 +21,7 @@ def test_flow(self, satosa_config_dict):
         """
         Performs the test.
         """
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         # Make request to frontend
         resp = test_client.get('/{}/{}/request'.format("backend", "frontend"))
@@ -35,7 +35,7 @@ def test_flow(self, satosa_config_dict):
         assert resp.data.decode('utf-8') == "Auth response received, passed to test frontend"
 
     def test_unknown_request_path(self, satosa_config_dict):
-        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), BaseResponse)
+        test_client = Client(make_app(SATOSAConfig(satosa_config_dict)), Response)
 
         resp = test_client.get('/unknown')
         assert resp.status == NotFound._status