diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-17 19:44:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 19:44:06 +0200 |
| commit | 771b853b8a0b13a476854eed4e98317d02232ebc (patch) | |
| tree | 6099599c299d5540614f4e98d252a11ecfea95c3 /documentapi/src/tests/policies/policies_test.cpp | |
| parent | 91ae05e15643b067d46a8fa9593d93c8b89bd1ab (diff) | |
| parent | a6d24b3ac1d0416847dddbfd686e953552ca68f6 (diff) | |
Merge pull request #28985 from vespa-engine/vekterli/improve-content-policy-thread-safetyv8.244.20
Improve thread safety of MessageBus (DocumentAPI) ContentPolicy
Diffstat (limited to 'documentapi/src/tests/policies/policies_test.cpp')
| -rw-r--r-- | documentapi/src/tests/policies/policies_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 9dd73a71920..7091b63b6b3 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -806,7 +806,7 @@ Test::requireThatContentPolicyIsRandomWithoutState() ContentPolicy &policy = setupContentPolicy( frame, param, "storage/cluster.mycluster/distributor/*/default", 5); - ASSERT_TRUE(policy.getSystemState() == nullptr); + ASSERT_FALSE(policy.getSystemState()); std::set<string> lst; for (uint32_t i = 0; i < 666; i++) { @@ -858,12 +858,12 @@ Test::requireThatContentPolicyIsTargetedWithState() "cluster=mycluster;slobroks=tcp/localhost:%d;clusterconfigid=%s;syncinit", slobrok.port(), getDefaultDistributionConfig(2, 5).c_str()); ContentPolicy &policy = setupContentPolicy(frame, param, "storage/cluster.mycluster/distributor/*/default", 5); - ASSERT_TRUE(policy.getSystemState() == nullptr); + ASSERT_FALSE(policy.getSystemState()); { std::vector<mbus::RoutingNode*> leaf; ASSERT_TRUE(frame.select(leaf, 1)); leaf[0]->handleReply(std::make_unique<WrongDistributionReply>("distributor:5 storage:5")); - ASSERT_TRUE(policy.getSystemState() != nullptr); + ASSERT_TRUE(policy.getSystemState()); EXPECT_EQUAL(policy.getSystemState()->toString(), "distributor:5 storage:5"); } std::set<string> lst; @@ -897,12 +897,12 @@ Test::requireThatContentPolicyCombinesSystemAndSlobrokState() ContentPolicy &policy = setupContentPolicy( frame, param, "storage/cluster.mycluster/distributor/*/default", 1); - ASSERT_TRUE(policy.getSystemState() == nullptr); + ASSERT_FALSE(policy.getSystemState()); { std::vector<mbus::RoutingNode*> leaf; ASSERT_TRUE(frame.select(leaf, 1)); leaf[0]->handleReply(std::make_unique<WrongDistributionReply>("distributor:99 storage:99")); - ASSERT_TRUE(policy.getSystemState() != nullptr); + ASSERT_TRUE(policy.getSystemState()); EXPECT_EQUAL(policy.getSystemState()->toString(), "distributor:99 storage:99"); } for (int i = 0; i < 666; i++) { |