aboutsummaryrefslogtreecommitdiffstats
path: root/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp')
-rw-r--r--devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp50
1 files changed, 50 insertions, 0 deletions
diff --git a/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp b/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp
new file mode 100644
index 000000000000..dde1aa63ced3
--- /dev/null
+++ b/devel/ice37/files/patch-cpp-test-Ice-metrics-AllTests.cpp
@@ -0,0 +1,50 @@
+--- cpp/test/Ice/metrics/AllTests.cpp.orig 2018-04-20 15:02:08 UTC
++++ cpp/test/Ice/metrics/AllTests.cpp
+@@ -712,9 +712,12 @@ allTests(const Ice::CommunicatorPtr& com
+ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "incoming", "false");
+ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "adapterName", "");
+ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "connectionId", "Con1");
+- testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localHost", host);
+- //testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localPort", "");
+- testAttribute(clientMetrics, clientProps, update.get(), "Connection", "remoteHost", host);
++ if (!inFreeBSDJail())
++ {
++ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localHost", host);
++ //testAttribute(clientMetrics, clientProps, update.get(), "Connection", "localPort", "");
++ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "remoteHost", host);
++ }
+ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "remotePort", port);
+ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "mcastHost", "");
+ testAttribute(clientMetrics, clientProps, update.get(), "Connection", "mcastPort", "");
+@@ -803,7 +806,7 @@ allTests(const Ice::CommunicatorPtr& com
+ bool dnsException = false;
+ try
+ {
+- communicator->stringToProxy("test:tcp -t 500 -h unknownfoo.zeroc.com -p " + port)->ice_ping();
++ communicator->stringToProxy("test:tcp -t 500 -h unknownhost9999.example.org -p " + port)->ice_ping();
+ test(false);
+ }
+ catch(const Ice::DNSException&)
+@@ -816,7 +819,7 @@ allTests(const Ice::CommunicatorPtr& com
+ }
+ test(clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"].size() == 2);
+ m1 = clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"][1];
+- test(m1->id == "tcp -h unknownfoo.zeroc.com -p " + port + " -t 500" && m1->total == 2 &&
++ test(m1->id == "tcp -h unknownhost9999.example.org -p " + port + " -t 500" && m1->total == 2 &&
+ (!dnsException || m1->failures == 2));
+ if(dnsException)
+ {
+@@ -947,9 +950,11 @@ allTests(const Ice::CommunicatorPtr& com
+ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "incoming", "true", op);
+ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "adapterName", "TestAdapter", op);
+ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "connectionId", "", op);
+- testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "localHost", host, op);
++ if (!inFreeBSDJail())
++ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "localHost", host, op);
+ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "localPort", port, op);
+- testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "remoteHost", host, op);
++ if (!inFreeBSDJail())
++ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "remoteHost", host, op);
+ //testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "remotePort", port, op);
+ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "mcastHost", "", op);
+ testAttribute(serverMetrics, serverProps, update.get(), "Dispatch", "mcastPort", "", op);