Refs #21188: Increase timeouts for CI testing

Signed-off-by: eduponz <[email protected]>
eProsima · Jul 11, 2024 · caecb71 · caecb71
1 parent 05ba0c0
commit caecb71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/test/examples/request_reply.compose.yml b/test/examples/request_reply.compose.yml
@@ -25,7 +25,7 @@ services:
       LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
       EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/request_reply@FILE_EXTENSION@
       FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/request_reply/request_reply_profile.xml
-    command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ client 2 5 & timeout --preserve-status 3 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
+    command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ client 2 5 & timeout --preserve-status 10 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
 
   client:
     image: @DOCKER_IMAGE_NAME@

diff --git a/test/examples/request_reply_isolated.compose.yml b/test/examples/request_reply_isolated.compose.yml
@@ -25,7 +25,7 @@ services:
       LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
       EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/request_reply@FILE_EXTENSION@
       FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/request_reply/request_reply_profile.xml
-    command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 3 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
+    command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 10 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
 
   server-2:
     image: @DOCKER_IMAGE_NAME@
@@ -38,7 +38,7 @@ services:
       LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
       EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/request_reply@FILE_EXTENSION@
       FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/request_reply/request_reply_profile.xml
-    command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 3 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
+    command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 10 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
 
   client-1:
     image: @DOCKER_IMAGE_NAME@

diff --git a/test/examples/test_request_reply.py b/test/examples/test_request_reply.py
@@ -73,13 +73,15 @@ def test_request_reply():
         for client in responses:
             if responses[client] != expected_responses[client]:
                 ret = False
-                print('ERROR: ' + client + ' expected "' + expected_responses[client] + '" but received "' + responses[client] + '"')
+                print(f'ERROR: {client} expected "{expected_responses[client]}" but received "{responses[client]}"')
                 raise subprocess.CalledProcessError(1, '')
 
     except subprocess.CalledProcessError:
         for l in out:
+            ret = False
             print(l)
     except subprocess.TimeoutExpired:
+        ret = False
         print('TIMEOUT')
         print(out)