Skip to content

Commit caecb71

Browse files
committed
Refs #21188: Increase timeouts for CI testing
Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent 05ba0c0 commit caecb71

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

test/examples/request_reply.compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
2626
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/request_reply@FILE_EXTENSION@
2727
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/request_reply/request_reply_profile.xml
28-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ client 2 5 & timeout --preserve-status 3 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
28+
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ client 2 5 & timeout --preserve-status 10 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
2929

3030
client:
3131
image: @DOCKER_IMAGE_NAME@

test/examples/request_reply_isolated.compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
2626
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/request_reply@FILE_EXTENSION@
2727
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/request_reply/request_reply_profile.xml
28-
command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 3 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
28+
command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 10 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
2929

3030
server-2:
3131
image: @DOCKER_IMAGE_NAME@
@@ -38,7 +38,7 @@ services:
3838
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
3939
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/request_reply@FILE_EXTENSION@
4040
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/request_reply/request_reply_profile.xml
41-
command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 3 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
41+
command: @SHELL_EXECUTABLE@ -c "timeout --preserve-status 10 $${EXAMPLE_DIR}/request_reply@FILE_EXTENSION@ server"
4242

4343
client-1:
4444
image: @DOCKER_IMAGE_NAME@

test/examples/test_request_reply.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,15 @@ def test_request_reply():
7373
for client in responses:
7474
if responses[client] != expected_responses[client]:
7575
ret = False
76-
print('ERROR: ' + client + ' expected "' + expected_responses[client] + '" but received "' + responses[client] + '"')
76+
print(f'ERROR: {client} expected "{expected_responses[client]}" but received "{responses[client]}"')
7777
raise subprocess.CalledProcessError(1, '')
7878

7979
except subprocess.CalledProcessError:
8080
for l in out:
81+
ret = False
8182
print(l)
8283
except subprocess.TimeoutExpired:
84+
ret = False
8385
print('TIMEOUT')
8486
print(out)
8587

0 commit comments

Comments
 (0)