diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-20 18:19:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-20 18:19:38 +0200 |
| commit | f0a2b08214196a0da608db2ab05adafabd70c868 (patch) | |
| tree | 31ebb60851195fe3d274f4bd100ca0738b2c5cf6 | |
| parent | Use https for default symbol server (diff) | |
| download | ice-f0a2b08214196a0da608db2ab05adafabd70c868.tar.bz2 ice-f0a2b08214196a0da608db2ab05adafabd70c868.tar.xz ice-f0a2b08214196a0da608db2ab05adafabd70c868.zip | |
Fixed ICE-8120 - metrics test failure
| -rw-r--r-- | cpp/test/Ice/metrics/AllTests.cpp | 3 | ||||
| -rw-r--r-- | csharp/test/Ice/metrics/AllTests.cs | 3 | ||||
| -rw-r--r-- | java-compat/test/src/main/java/test/Ice/metrics/AllTests.java | 3 | ||||
| -rw-r--r-- | java/test/src/main/java/test/Ice/metrics/AllTests.java | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp index 43a87962fb5..d58bc0f6a52 100644 --- a/cpp/test/Ice/metrics/AllTests.cpp +++ b/cpp/test/Ice/metrics/AllTests.cpp @@ -497,6 +497,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt metrics->ice_connectionId("Con1")->ice_ping(); waitForCurrent(clientMetrics, "View", "Invocation", 0); + waitForCurrent(serverMetrics, "View", "Dispatch", 0); view = clientMetrics->getMetricsView("View", timestamp); if(!collocated) @@ -529,7 +530,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt test(view["Connection"].size() == 2); } test(view["Dispatch"].size() == 1); - test(view["Dispatch"][0]->current <= 1 && view["Dispatch"][0]->total == 5); + test(view["Dispatch"][0]->current == 0 && view["Dispatch"][0]->total == 5); test(view["Dispatch"][0]->id.find("[ice_ping]") > 0); if(!collocated) diff --git a/csharp/test/Ice/metrics/AllTests.cs b/csharp/test/Ice/metrics/AllTests.cs index de3c3515255..ed9b20d2a01 100644 --- a/csharp/test/Ice/metrics/AllTests.cs +++ b/csharp/test/Ice/metrics/AllTests.cs @@ -449,6 +449,7 @@ public class AllTests : TestCommon.AllTests metrics.ice_connectionId("Con1").ice_ping(); waitForCurrent(clientMetrics, "View", "Invocation", 0); + waitForCurrent(serverMetrics, "View", "Dispatch", 0); view = clientMetrics.getMetricsView("View", out timestamp); test(view["Thread"].Length == 5); @@ -481,7 +482,7 @@ public class AllTests : TestCommon.AllTests test(view["Connection"].Length == 2); } test(view["Dispatch"].Length == 1); - test(view["Dispatch"][0].current <= 1 && view["Dispatch"][0].total == 5); + test(view["Dispatch"][0].current == 0 && view["Dispatch"][0].total == 5); test(view["Dispatch"][0].id.IndexOf("[ice_ping]") > 0); if(!collocated) diff --git a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java index 619ba3f330e..cdf0679b594 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java @@ -511,6 +511,7 @@ public class AllTests metrics.ice_connectionId("Con1").ice_ping(); waitForCurrent(clientMetrics, "View", "Invocation", 0); + waitForCurrent(serverMetrics, "View", "Dispatch", 0); view = clientMetrics.getMetricsView("View", timestamp); test(view.get("Thread").length == threadCount); @@ -540,7 +541,7 @@ public class AllTests test(view.get("Connection").length == 2); } test(view.get("Dispatch").length == 1); - test(view.get("Dispatch")[0].current <= 1 && view.get("Dispatch")[0].total == 5); + test(view.get("Dispatch")[0].current == 0 && view.get("Dispatch")[0].total == 5); test(view.get("Dispatch")[0].id.indexOf("[ice_ping]") > 0); if(!collocated) diff --git a/java/test/src/main/java/test/Ice/metrics/AllTests.java b/java/test/src/main/java/test/Ice/metrics/AllTests.java index 67481fdfb4c..cec584810d6 100644 --- a/java/test/src/main/java/test/Ice/metrics/AllTests.java +++ b/java/test/src/main/java/test/Ice/metrics/AllTests.java @@ -444,6 +444,7 @@ public class AllTests metrics.ice_connectionId("Con1").ice_ping(); waitForCurrent(clientMetrics, "View", "Invocation", 0); + waitForCurrent(serverMetrics, "View", "Dispatch", 0); r = clientMetrics.getMetricsView("View"); test(r.returnValue.get("Thread").length == threadCount); @@ -473,7 +474,7 @@ public class AllTests test(r.returnValue.get("Connection").length == 2); } test(r.returnValue.get("Dispatch").length == 1); - test(r.returnValue.get("Dispatch")[0].current <= 1 && r.returnValue.get("Dispatch")[0].total == 5); + test(r.returnValue.get("Dispatch")[0].current == 0 && r.returnValue.get("Dispatch")[0].total == 5); test(r.returnValue.get("Dispatch")[0].id.indexOf("[ice_ping]") > 0); if(!collocated) |