diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-29 17:00:45 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-29 17:00:45 +0100 |
| commit | 80f46d89c959963ed69e905e46e64f942b6e236e (patch) | |
| tree | 6ffaa84555032d524c18ca733d01b0ce6bf1b702 /java/test | |
| parent | Fixed ICE-5036 - Ice metrics test failure (diff) | |
| download | ice-80f46d89c959963ed69e905e46e64f942b6e236e.tar.bz2 ice-80f46d89c959963ed69e905e46e64f942b6e236e.tar.xz ice-80f46d89c959963ed69e905e46e64f942b6e236e.zip | |
Better fix for ICE-5036 - Ice metrics test failure
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/Ice/metrics/AllTests.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/Ice/metrics/AllTests.java index 9d283110e1b..90ba81c10ca 100644 --- a/java/test/Ice/metrics/AllTests.java +++ b/java/test/Ice/metrics/AllTests.java @@ -692,15 +692,19 @@ public class AllTests prx.ice_getConnection().close(false); - String exceptionName = null; + boolean dnsException = false; try { communicator.stringToProxy("test:tcp -p 12010 -h unknownfoo.zeroc.com").ice_ping(); test(false); } + catch(Ice.DNSException ex) + { + dnsException = true; + } catch(Ice.LocalException ex) { - exceptionName = ex.ice_name(); + // Some DNS servers don't fail on unknown DNS names. } test(clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup").length == 2); m1 = clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup")[0]; @@ -708,9 +712,12 @@ public class AllTests { m1 = clientMetrics.getMetricsView("View", timestamp).get("EndpointLookup")[1]; } - test(m1.id.equals("tcp -h unknownfoo.zeroc.com -p 12010") && m1.total == 2 && m1.failures == 2); - - checkFailure(clientMetrics, "EndpointLookup", m1.id, exceptionName, 2, out); + test(m1.id.equals("tcp -h unknownfoo.zeroc.com -p 12010") && m1.total == 2 && + (!dnsException || m1.failures == 2)); + if(dnsException) + { + checkFailure(clientMetrics, "EndpointLookup", m1.id, "Ice::DNSException", 2, out); + } c = new Connect(prx); |