Skip to content

Commit d2df5ca

Browse files
committed
Refs #24527: Update test persistence & improve isolation
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
1 parent b147d5c commit d2df5ca

13 files changed

Lines changed: 15 additions & 15 deletions

File tree

ddsenabler/examples/action/CLIParser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CLIParser
6060
<< std::endl;
6161
std::cout << "--action-name <str> Name of the action to be registered"
6262
<< std::endl;
63-
std::cout << " (Default: 'Fibonacci/_action/')"
63+
std::cout << " (Default: 'fibonacci')"
6464
<< std::endl;
6565
std::cout << "--timeout <num> Time (seconds) to wait before stopping the"
6666
<< std::endl;

ddsenabler/examples/persistence/actions/fibonacci__action_

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"action_name": "fibonacci/_action/",
2+
"action_name": "fibonacci",
33
"cancel_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false",
44
"cancel_reply_action_type": "action_msgs::srv::dds_::CancelGoal_Response_",
55
"cancel_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false",

ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ TEST_F(DDSEnablerTest, action_client)
428428
std::this_thread::sleep_for(std::chrono::seconds(2));
429429

430430
std::string json = "{\"order\": 20}";
431-
std::string action_name = "fibonacci/_action/";
431+
std::string action_name = "fibonacci";
432432
UUID action_id;
433433

434434
ASSERT_FALSE(enabler->send_action_goal(action_name, json, action_id));
@@ -439,7 +439,7 @@ TEST_F(DDSEnablerTest, action_server)
439439
auto enabler = create_ddsenabler();
440440
ASSERT_TRUE(enabler != nullptr);
441441

442-
std::string action_name = "fibonacci/_action/";
442+
std::string action_name = "fibonacci";
443443

444444
ASSERT_FALSE(enabler->revoke_action(action_name));
445445
ASSERT_TRUE(enabler->announce_action(action_name));

ddsenabler/test/ddsEnablerTests/test_files/fibonacci__action_

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"action_name": "fibonacci/_action/",
2+
"action_name": "fibonacci",
33
"cancel_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false",
44
"cancel_reply_action_type": "action_msgs::srv::dds_::CancelGoal_Response_",
55
"cancel_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false",

ddsenabler_test/compose/test_cases/actions/action_client/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- std_net
1313
volumes:
1414
- ./config.yml:/config/config.yml
15-
- ../persistence:/persistence
15+
- ../persistence:/persistence:ro
1616
command: ./install/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2
1717

1818
fibonacci_server:

ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- std_net
1212
volumes:
1313
- ./config.yml:/config/config.yml
14-
- ../persistence:/persistence
14+
- ../persistence:/persistence:ro
1515
command: ./install/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 --cancel-requests true
1616

1717
fibonacci_server:

ddsenabler_test/compose/test_cases/actions/action_server/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- std_net
1111
volumes:
1212
- ./config.yml:/config/config.yml
13-
- ../persistence:/persistence
13+
- ../persistence:/persistence:ro
1414
command: ./install/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 3
1515

1616
fibonacci_client:

ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- std_net
1111
volumes:
1212
- ./config.yml:/config/config.yml
13-
- ../persistence:/persistence
13+
- ../persistence:/persistence:ro
1414
command: ./install/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 9
1515

1616
fibonacci_client_1:

ddsenabler_test/compose/test_cases/actions/persistence/actions/fibonacci__action_

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"action_name": "fibonacci/_action/",
2+
"action_name": "fibonacci",
33
"cancel_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false",
44
"cancel_reply_action_type": "action_msgs::srv::dds_::CancelGoal_Response_",
55
"cancel_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false",
@@ -16,4 +16,4 @@
1616
"result_request_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_GetResult_Request_",
1717
"status_action_serialized_qos": "reliability: true\ndurability: true\nownership: false\nkeyed: false",
1818
"status_action_type": "action_msgs::msg::dds_::GoalStatusArray_"
19-
}
19+
}

ddsenabler_test/compose/test_cases/services/service_client/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- std_net
1313
volumes:
1414
- ./config.yml:/config/config.yml
15-
- ../persistence:/persistence
15+
- ../persistence:/persistence:ro
1616
command: ./install/ddsenabler/examples/service/ddsenabler_example_service client --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --request-initial-wait 2
1717
add_two_ints_server:
1818
image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE}

0 commit comments

Comments
 (0)