diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-11-20 09:44:32 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-11-20 09:44:43 +0100 |
| commit | 2d563f5e84599204048442b6484dd0a9a860e271 (patch) | |
| tree | da9f57f3b5e726eeb8831669fe4e2454405e4395 /cpp | |
| parent | Fix #635 - Python 3.8 build failure (diff) | |
| download | ice-2d563f5e84599204048442b6484dd0a9a860e271.tar.bz2 ice-2d563f5e84599204048442b6484dd0a9a860e271.tar.xz ice-2d563f5e84599204048442b6484dd0a9a860e271.zip | |
Fixed Ice/metrics test failure, fixes #638
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/metrics/AllTests.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp index bac94d681c1..e33253707e8 100644 --- a/cpp/test/Ice/metrics/AllTests.cpp +++ b/cpp/test/Ice/metrics/AllTests.cpp @@ -1365,6 +1365,7 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) metricsOneway->op(); #ifdef ICE_CPP11_MAPPING metricsOneway->opAsync().get(); + promise<void> sent; metricsOneway->opAsync( [cb]() { @@ -1384,10 +1385,12 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) { test(false); } - }); + }, + [&](bool) { sent.set_value(); }); + sent.get_future().get(); #else metricsOneway->end_op(metricsOneway->begin_op()); - metricsOneway->begin_op(newCallback_Metrics_op(cb, &Callback::response, &Callback::exception)); + metricsOneway->begin_op(newCallback_Metrics_op(cb, &Callback::response, &Callback::exception))->waitForSent(); #endif map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); test(map.size() == 1); |