Skip to content

Commit

Permalink
Refs #21188: Increase timeouts for CI testing
Browse files Browse the repository at this point in the history
Signed-off-by: eduponz <eduardoponz@eprosima.com>
  • Loading branch information
EduPonz committed Jul 11, 2024
1 parent 05ba0c0 commit caecb71
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test/examples/request_reply.compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down
4 changes: 2 additions & 2 deletions test/examples/request_reply_isolated.compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand All @@ -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@
Expand Down
4 changes: 3 additions & 1 deletion test/examples/test_request_reply.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit caecb71

Please sign in to comment.