Set async test timeout

3liz · Aug 21, 2024 · 62f95ce · 62f95ce
1 parent 1d8b4f7
commit 62f95ce
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,13 +22,15 @@ stages:
     - make test FLAVOR=$QGIS_FLAVOR
   tags:
     - factory-plain
+  variables:
+    ASYNC_TEST_TIMEOUT: "20"
 
 tests:
   extends: .tests
   resource_group: py_qgis_wps_tests
   parallel:
-      matrix:
-          - QGIS_FLAVOR: ['ltr', 'release', '3.28']
+    matrix:
+    - QGIS_FLAVOR: ['ltr', 'release', '3.28']
 
 # Docker build 
 include: '/docker/.gitlab-ci.yml'

diff --git a/pyqgiswps/poolserver/client.py b/pyqgiswps/poolserver/client.py
@@ -161,7 +161,7 @@ def apply_async(
         request = pickle.dumps((target, args, kwargs))
         return self._apply_async(request, timeout)
 
-    async def _apply_async(self, request: bytes, timeout: int = 5) -> Any:
+    async def _apply_async(self, request: bytes, timeout: int) -> Any:
         """ Run job asynchronously
         """
         if len(self._handlers) > self._maxqueue:

diff --git a/pyqgiswps/tests.py b/pyqgiswps/tests.py
@@ -214,7 +214,8 @@ def put(
                 path,
                 method='PUT',
                 body=data,
-                raise_error=False, headers=headers,
+                raise_error=False,
+                headers=headers,
             ),
         )
 

diff --git a/tests/unittests/processing/test_executor.py b/tests/unittests/processing/test_executor.py
@@ -82,9 +82,16 @@ def test_mapcontext_describe(self):
     def test_mapcontext_execute(self):
         """ Test execute process with context
         """
-        rv = self.client.get(("/ows/?SERVICE=WPS&Request=Execute"
-                              "&Identifier=pyqgiswps_test:testmapcontext&Version=1.0.0"
-                              "&MAP=france_parts&DATAINPUTS=INPUT=hello_context"), path="")
+        rv = self.client.get(
+            (
+                "/ows/?SERVICE=WPS"
+                "&Request=Execute"
+                "&Identifier=pyqgiswps_test:testmapcontext"
+                "&Version=1.0.0"
+                "&MAP=france_parts&DATAINPUTS=INPUT=hello_context"
+            ),
+            path="",
+        )
         assert rv.status_code == 200
         assert rv.xpath_text('//wps:ProcessOutputs/wps:Output/wps:Data/wps:LiteralData') == 'france_parts'
 
@@ -110,8 +117,13 @@ def test_status_location(self):
     def test_proxy_url(self):
         """ Test if proxy url is set
         """
-        uri = ('/ows/?service=WPS&request=Execute&Identifier=pyqgiswps_test:testcopylayer&Version=1.0.0'
-                               '&MAP=france_parts&DATAINPUTS=INPUT=france_parts%3BOUTPUT=france_parts_2')
+        uri = (
+            '/ows/?service=WPS'
+            '&request=Execute'
+            '&Identifier=pyqgiswps_test:testcopylayer'
+            '&Version=1.0.0'
+            '&MAP=france_parts&DATAINPUTS=INPUT=france_parts%3BOUTPUT=france_parts_2'
+        )
         proxy_loc = 'http://test.proxy.loc:8080/anyhwere/'
 
         headers = {'X-Forwarded-Url': proxy_loc}
@@ -152,8 +164,13 @@ def test_proxy_url(self):
     def test_service_url(self):
         """ Test service url header
         """
-        uri = ('/ows/?service=WPS&request=Execute&Identifier=pyqgiswps_test:testcopylayer&Version=1.0.0'
-                               '&MAP=france_parts&DATAINPUTS=INPUT=france_parts%3BOUTPUT=france_parts_2')
+        uri = (
+            '/ows/?service=WPS'
+            '&request=Execute'
+            '&Identifier=pyqgiswps_test:testcopylayer'
+            '&Version=1.0.0'
+            '&MAP=france_parts&DATAINPUTS=INPUT=france_parts%3BOUTPUT=france_parts_2'
+        )
         proxy_loc = 'http://test.proxy.loc:8080/anyhwere/'
 
         headers = {'X-Qgis-Service-Url': proxy_loc}