Skip to content

Commit

Permalink
Refs #22321: Compose simplify for test
Browse files Browse the repository at this point in the history
Signed-off-by: Javier Gil Aviles <javiergil@eprosima.com>
  • Loading branch information
Javgilavi committed Dec 16, 2024
1 parent 6fc1e8f commit 2a4715b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions test/examples/benchmark.compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/benchmark/@EXAMPLE_SUFFIX_DIR_COMPOSE@
FASTDDS_DEFAULT_PROFILES_FILE: @FASTDDS_DEFAULT_PROFILES_FILE_PREFIX_COMPOSE@/benchmark/benchmark_profile.xml
SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${SUB_ARGS}
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/benchmark@FILE_EXTENSION@ subscriber $${SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/benchmark@FILE_EXTENSION@ subscriber --reliable --transient-local --samples 1000 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS}"

publisher:
image: @DOCKER_IMAGE_NAME@
Expand All @@ -43,4 +43,4 @@ services:
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/benchmark/@EXAMPLE_SUFFIX_DIR_COMPOSE@
FASTDDS_DEFAULT_PROFILES_FILE: @FASTDDS_DEFAULT_PROFILES_FILE_PREFIX_COMPOSE@/benchmark/benchmark_profile.xml
PUBLISHER_ADDITIONAL_ARGUMENTS: ${PUB_ARGS}
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/benchmark@FILE_EXTENSION@ publisher $${PUBLISHER_ADDITIONAL_ARGUMENTS}"
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/benchmark@FILE_EXTENSION@ publisher --reliable --transient-local --samples 1000 $${PUBLISHER_ADDITIONAL_ARGUMENTS}"
4 changes: 1 addition & 3 deletions test/examples/test_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ def test_benchmark(pub_args, sub_args):
"""."""
ret = False
out = ''
pub_requirements = '--reliable --transient-local -s 1000'
sub_requirements = '--reliable --transient-local -s 1000'

command_prerequisites = 'PUB_ARGS="' + pub_requirements + ' ' + pub_args + '" SUB_ARGS="' + sub_requirements + ' ' + sub_args + '" '
command_prerequisites = 'PUB_ARGS="' + pub_args + '" SUB_ARGS="' + sub_args + '" '

try:
out = subprocess.check_output(command_prerequisites + '@DOCKER_EXECUTABLE@ compose -f benchmark.compose.yml up',
Expand Down

0 comments on commit 2a4715b

Please sign in to comment.