From 7fea8ef9693f424f8f7165744d8ec4ff7cf69716 Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:08:46 +0100 Subject: [PATCH 1/3] Refs #20653: Increase sleep to miss the deadline in test exclusive_kind_non_keyed_reliable_deadline Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- .../common/DDSBlackboxTestsOwnershipQos.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp index dc2b92d9ac7..dabb28a2371 100644 --- a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp @@ -721,46 +721,46 @@ TEST_P(OwnershipQos, exclusive_kind_non_keyed_reliable_deadline) writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(110)); writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(30)); reader.block_for_seq({0, 7}); ASSERT_EQ(denied_samples.size(), reader.data_not_received().size()); From fc4cfa8491dea1fcf4ba9ef4ce96fc93de57544b Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:59:18 +0200 Subject: [PATCH 2/3] Refs #20653: Increase sleep to miss the deadline in test exclusive_kind_keyed_reliable_deadline Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- .../common/DDSBlackboxTestsOwnershipQos.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp index dabb28a2371..c3997cdc0f1 100644 --- a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp @@ -721,29 +721,29 @@ TEST_P(OwnershipQos, exclusive_kind_non_keyed_reliable_deadline) writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); @@ -752,15 +752,15 @@ TEST_P(OwnershipQos, exclusive_kind_non_keyed_reliable_deadline) writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); reader.block_for_seq({0, 7}); ASSERT_EQ(denied_samples.size(), reader.data_not_received().size()); @@ -800,13 +800,13 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) data.pop_front(); writer1.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer2.send_sample(data.front()); data.pop_front(); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); @@ -814,13 +814,13 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer2.send_sample(data.front()); data.pop_front(); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); @@ -828,13 +828,13 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer2.send_sample(data.front()); data.pop_front(); writer2.send_sample(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(20)); writer1.send_sample(data.front()); denied_samples.push_back(data.front()); @@ -842,7 +842,7 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(110)); writer1.send_sample(data.front()); data.pop_front(); @@ -853,7 +853,7 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(110)); writer1.send_sample(data.front()); data.pop_front(); @@ -864,7 +864,7 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(110)); writer1.send_sample(data.front()); data.pop_front(); From 29d88625278264d3572f91674108c684f8e1b1b3 Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Fri, 5 Apr 2024 12:34:43 +0200 Subject: [PATCH 3/3] Refs #20653: Add lease duration and increase deadline Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- .../common/DDSBlackboxTestsOwnershipQos.cpp | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp index c3997cdc0f1..cbe1676f95c 100644 --- a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp @@ -701,9 +701,11 @@ TEST_P(OwnershipQos, exclusive_kind_non_keyed_reliable_deadline) PubSubWriter writer1(TEST_TOPIC_NAME); PubSubWriter writer2(TEST_TOPIC_NAME); - reader.ownership_exclusive().reliability(RELIABLE_RELIABILITY_QOS).deadline_period({0, 100000000}).init(); - writer1.ownership_strength(1).deadline_period({0, 100000000}).init(); - writer2.ownership_strength(2).deadline_period({0, 100000000}).init(); + reader.ownership_exclusive().reliability(RELIABLE_RELIABILITY_QOS).deadline_period({0, 500000000}).lease_duration( + {50, 0}, {3, 0}).init(); + writer1.ownership_strength(1).deadline_period({0, 500000000}).lease_duration({50, 0}, {3, 0}).init(); + writer2.ownership_strength(2).deadline_period({0, 500000000}).lease_duration({50, 0}, {3, 0}).init(); + ASSERT_TRUE(reader.isInitialized()); ASSERT_TRUE(writer1.isInitialized()); @@ -748,7 +750,7 @@ TEST_P(OwnershipQos, exclusive_kind_non_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(110)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); writer1.send_sample(data.front()); data.pop_front(); @@ -778,9 +780,10 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) PubSubWriter writer1(TEST_TOPIC_NAME); PubSubWriter writer2(TEST_TOPIC_NAME); - reader.ownership_exclusive().reliability(RELIABLE_RELIABILITY_QOS).deadline_period({0, 100000000}).init(); - writer1.ownership_strength(1).deadline_period({0, 100000000}).init(); - writer2.ownership_strength(2).deadline_period({0, 100000000}).init(); + reader.ownership_exclusive().reliability(RELIABLE_RELIABILITY_QOS).deadline_period({0, 500000000}).lease_duration( + {50, 0}, {3, 0}).init(); + writer1.ownership_strength(1).deadline_period({0, 500000000}).lease_duration({50, 0}, {3, 0}).init(); + writer2.ownership_strength(2).deadline_period({0, 500000000}).lease_duration({50, 0}, {3, 0}).init(); ASSERT_TRUE(reader.isInitialized()); ASSERT_TRUE(writer1.isInitialized()); @@ -842,7 +845,7 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(110)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); writer1.send_sample(data.front()); data.pop_front(); @@ -853,7 +856,7 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(110)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); writer1.send_sample(data.front()); data.pop_front(); @@ -864,7 +867,7 @@ TEST_P(OwnershipQos, exclusive_kind_keyed_reliable_deadline) writer1.send_sample(data.front()); denied_samples.push_back(data.front()); data.pop_front(); - std::this_thread::sleep_for(std::chrono::milliseconds(110)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); writer1.send_sample(data.front()); data.pop_front();