diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-07-16 17:32:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-07-16 17:32:44 +0200 |
| commit | 1b20aaa7889f7cc376fba7c5da8da8b7dce57f58 (patch) | |
| tree | 32f33988878203a95629d1afc96b9d346624e28f /java-compat | |
| parent | Fix js/objetive-c cross test failure - Close #447 (diff) | |
| download | ice-1b20aaa7889f7cc376fba7c5da8da8b7dce57f58.tar.bz2 ice-1b20aaa7889f7cc376fba7c5da8da8b7dce57f58.tar.xz ice-1b20aaa7889f7cc376fba7c5da8da8b7dce57f58.zip | |
Fixed potential metrics test failure, fixes #217
Diffstat (limited to 'java-compat')
| -rw-r--r-- | java-compat/test/src/main/java/test/Ice/metrics/AllTests.java | 12 |
1 files changed, 4 insertions, 8 deletions
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 c4843c606b4..376c72a76af 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 @@ -977,7 +977,7 @@ public class AllTests out.flush(); props.put("IceMX.Metrics.View.Map.Invocation.GroupBy", "operation"); - props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "localPort"); + props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "id"); props.put("IceMX.Metrics.View.Map.Invocation.Map.Collocated.GroupBy", "id"); updateProps(clientProps, serverProps, update, props, "Invocation"); test(serverMetrics.getMetricsView("View", timestamp).get("Invocation").length == 0); @@ -1142,13 +1142,9 @@ public class AllTests if(!collocated) { im1 = (IceMX.InvocationMetrics)map.get("fail"); - test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 6); - test(im1.remotes[0].current == 0 && im1.remotes[0].total == 1 && im1.remotes[0].failures == 1); - test(im1.remotes[1].current == 0 && im1.remotes[1].total == 1 && im1.remotes[1].failures == 1); - test(im1.remotes[2].current == 0 && im1.remotes[2].total == 1 && im1.remotes[2].failures == 1); - test(im1.remotes[3].current == 0 && im1.remotes[3].total == 1 && im1.remotes[3].failures == 1); - test(im1.remotes[4].current == 0 && im1.remotes[4].total == 1 && im1.remotes[4].failures == 1); - test(im1.remotes[5].current == 0 && im1.remotes[5].total == 1 && im1.remotes[5].failures == 1); + test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 1); + rim1 = (IceMX.ChildInvocationMetrics)im1.remotes[0]; + test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6); checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, out); } |