From cdc8ed451efd5069f25e006131cd1d6c8c4488c2 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Fri, 13 Mar 2020 14:59:39 +0900 Subject: [PATCH 1/5] roscpp ActionClient subscription queue size should be more than 1, and also consistent with rospy. Signed-off-by: Tomoya.Fujita --- actionlib/include/actionlib/client/action_client.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actionlib/include/actionlib/client/action_client.h b/actionlib/include/actionlib/client/action_client.h index f87f852c..cfd64afe 100644 --- a/actionlib/include/actionlib/client/action_client.h +++ b/actionlib/include/actionlib/client/action_client.h @@ -221,9 +221,9 @@ class ActionClient int pub_queue_size; int sub_queue_size; n_.param("actionlib_client_pub_queue_size", pub_queue_size, 10); - n_.param("actionlib_client_sub_queue_size", sub_queue_size, 1); + n_.param("actionlib_client_sub_queue_size", sub_queue_size, -1); if (pub_queue_size < 0) {pub_queue_size = 10;} - if (sub_queue_size < 0) {sub_queue_size = 1;} + if (sub_queue_size < 0) {sub_queue_size = 0;} status_sub_ = queue_subscribe("status", static_cast(sub_queue_size), &ActionClientT::statusCb, this, queue); From d3dfd5420677afd29913b7d693ade67f0d449f0b Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Tue, 17 Mar 2020 10:58:45 +0900 Subject: [PATCH 2/5] expand test duration for test_exercise_simple_clients. Signed-off-by: Tomoya.Fujita --- actionlib/test/test_exercise_simple_clients.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionlib/test/test_exercise_simple_clients.launch b/actionlib/test/test_exercise_simple_clients.launch index c54905df..a2ebd816 100644 --- a/actionlib/test/test_exercise_simple_clients.launch +++ b/actionlib/test/test_exercise_simple_clients.launch @@ -7,6 +7,6 @@ pkg="actionlib" type="exercise_simple_client.py" /> + pkg="actionlib" type="actionlib-exercise_simple_client" time-limit="90.0"/> From 32da5df7630edb788352c0e51be6ee874ecb030c Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Wed, 18 Mar 2020 11:37:01 +0900 Subject: [PATCH 3/5] Revert "expand test duration for test_exercise_simple_clients." This reverts commit d3dfd5420677afd29913b7d693ade67f0d449f0b. --- actionlib/test/test_exercise_simple_clients.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionlib/test/test_exercise_simple_clients.launch b/actionlib/test/test_exercise_simple_clients.launch index a2ebd816..c54905df 100644 --- a/actionlib/test/test_exercise_simple_clients.launch +++ b/actionlib/test/test_exercise_simple_clients.launch @@ -7,6 +7,6 @@ pkg="actionlib" type="exercise_simple_client.py" /> + pkg="actionlib" type="actionlib-exercise_simple_client" /> From be7c7051ff5161f3513d007c680a0963156d9d58 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Wed, 25 Mar 2020 15:46:01 +0900 Subject: [PATCH 4/5] expand test duration and timeout for test_exercise_simple_clients. Signed-off-by: Tomoya.Fujita --- actionlib/test/exercise_simple_client.cpp | 2 +- actionlib/test/test_exercise_simple_clients.launch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actionlib/test/exercise_simple_client.cpp b/actionlib/test/exercise_simple_client.cpp index e7d5dd07..613a3924 100644 --- a/actionlib/test/exercise_simple_client.cpp +++ b/actionlib/test/exercise_simple_client.cpp @@ -50,7 +50,7 @@ class SimpleClientFixture : public testing::Test { public: SimpleClientFixture() - : ac_("test_request_action"), default_wait_(60.0) {} + : ac_("test_request_action"), default_wait_(120.0) {} protected: virtual void SetUp() diff --git a/actionlib/test/test_exercise_simple_clients.launch b/actionlib/test/test_exercise_simple_clients.launch index c54905df..3f83e75e 100644 --- a/actionlib/test/test_exercise_simple_clients.launch +++ b/actionlib/test/test_exercise_simple_clients.launch @@ -7,6 +7,6 @@ pkg="actionlib" type="exercise_simple_client.py" /> + pkg="actionlib" type="actionlib-exercise_simple_client" time-limit="180.0" /> From 8f8f8959e65a49efc32750f2e8b905cedd9f3296 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Thu, 26 Mar 2020 09:18:58 +0900 Subject: [PATCH 5/5] Revert " expand test duration and timeout for test_exercise_simple_clients." This reverts commit be7c7051ff5161f3513d007c680a0963156d9d58. --- actionlib/test/exercise_simple_client.cpp | 2 +- actionlib/test/test_exercise_simple_clients.launch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actionlib/test/exercise_simple_client.cpp b/actionlib/test/exercise_simple_client.cpp index 613a3924..e7d5dd07 100644 --- a/actionlib/test/exercise_simple_client.cpp +++ b/actionlib/test/exercise_simple_client.cpp @@ -50,7 +50,7 @@ class SimpleClientFixture : public testing::Test { public: SimpleClientFixture() - : ac_("test_request_action"), default_wait_(120.0) {} + : ac_("test_request_action"), default_wait_(60.0) {} protected: virtual void SetUp() diff --git a/actionlib/test/test_exercise_simple_clients.launch b/actionlib/test/test_exercise_simple_clients.launch index 3f83e75e..c54905df 100644 --- a/actionlib/test/test_exercise_simple_clients.launch +++ b/actionlib/test/test_exercise_simple_clients.launch @@ -7,6 +7,6 @@ pkg="actionlib" type="exercise_simple_client.py" /> + pkg="actionlib" type="actionlib-exercise_simple_client" />