speed up some tests setup + avoid long timeout on random server for subscriber test requests

Author: fmigneault

tests/functional/test_cli.py

@@ -15,6 +15,7 @@
 
 import mock
 import pytest
+import responses
 import yaml
 from owslib.ows import DEFAULT_OWS_NAMESPACE
 from owslib.wps import WPSException
@@ -1869,13 +1870,18 @@ def test_execute_subscriber_options(self):
         """
         proc = self.test_process["Echo"]
         with contextlib.ExitStack() as stack_exec:
+            req_mock = stack_exec.enter_context(responses.RequestsMock())
             for mock_exec_proc in mocked_execute_celery():
                 stack_exec.enter_context(mock_exec_proc)
 
             test_email_started = "started-job@email.com"
             test_email_failed = "failed-job@email.com"
             test_callback_started = "https://server.com/started"
             test_callback_success = "https://server.com/success"
+
+            req_mock.add_callback(responses.POST, test_callback_started, callback=lambda _: (200, {}, ""))
+            req_mock.add_callback(responses.POST, test_callback_success, callback=lambda _: (200, {}, ""))
+
             lines = mocked_sub_requests(
                 self.app, run_command,
                 [

tests/wps_restapi/test_status_codes.py

@@ -2,6 +2,7 @@
 import uuid
 
 import pytest
+from parameterized import parameterized
 
 from tests.utils import get_test_weaver_app, setup_config_with_mongodb
 from weaver.formats import ContentType
@@ -45,23 +46,24 @@ class StatusCodeTestCase(unittest.TestCase):
 
     headers = {"Accept": ContentType.APP_JSON}
 
-    def setUp(self):
+    @classmethod
+    def setUpClass(cls):
         config = setup_config_with_mongodb()
-        self.testapp = get_test_weaver_app(config)
+        cls.testapp = get_test_weaver_app(config)
 
-    def test_200(self):
-        for uri in TEST_PUBLIC_ROUTES:
-            resp = self.testapp.get(uri, expect_errors=True, headers=self.headers)
-            self.assertEqual(200, resp.status_code, f"route {uri} did not return 200")
+    @parameterized.expand(TEST_PUBLIC_ROUTES)
+    def test_200(self, uri):
+        resp = self.testapp.get(uri, expect_errors=True, headers=self.headers)
+        self.assertEqual(200, resp.status_code, f"route {uri} did not return 200")
 
     @pytest.mark.xfail(reason="Not working if not behind proxy. Protected implementation to be done.")
+    @parameterized.expand(TEST_FORBIDDEN_ROUTES)
     @unittest.expectedFailure
-    def test_401(self):
-        for uri in TEST_FORBIDDEN_ROUTES:
-            resp = self.testapp.get(uri, expect_errors=True, headers=self.headers)
-            self.assertEqual(401, resp.status_code, f"route {uri} did not return 401")
+    def test_401(self, uri):
+        resp = self.testapp.get(uri, expect_errors=True, headers=self.headers)
+        self.assertEqual(401, resp.status_code, f"route {uri} did not return 401")
 
-    def test_404(self):
-        for uri in TEST_NOTFOUND_ROUTES:
-            resp = self.testapp.get(uri, expect_errors=True, headers=self.headers)
-            self.assertEqual(404, resp.status_code, f"route {uri} did not return 404")
+    @parameterized.expand(TEST_NOTFOUND_ROUTES)
+    def test_404(self, uri):
+        resp = self.testapp.get(uri, expect_errors=True, headers=self.headers)
+        self.assertEqual(404, resp.status_code, f"route {uri} did not return 404")