[mercedesme] Fix unstable ConfigurationTest (#13650)

* Make sure IPv4 is used with default callback URL
* Use a more reasonable timeout

Fixes #13531

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java
index 0c98f72ac6b138489994c3df7e9cf6f4a133f093..c9545dfde17c5a826134ad3e57dfb3a93a010d53 100644 (file)
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.binding.mercedesme.internal.server;
 
+import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -70,7 +71,9 @@ public class Utils {
                         for (Enumeration<InetAddress> addresses = iface.getInetAddresses(); addresses
                                 .hasMoreElements();) {
                             InetAddress address = addresses.nextElement();
-                            return address.getHostAddress();
+                            if (address instanceof Inet4Address) {
+                                return address.getHostAddress();
+                            }
                         }
                     }
                 }

diff --git a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ConfigurationTest.java b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ConfigurationTest.java
index d8361a7515a48b076bc8dffbd7356979a2ae759b..72714670684b09a6c29e1d5d58fc2d0c47e29a38 100644 (file)
--- a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ConfigurationTest.java
+++ b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ConfigurationTest.java
@@ -62,10 +62,11 @@ class ConfigurationTest {
     @Test
     public void testCallbackUrl() throws SocketException {
         String ip = Utils.getCallbackIP();
+        String message = "IP " + ip + " not reachable";
         try {
-            assertTrue(InetAddress.getByName(ip).isReachable(10));
+            assertTrue(InetAddress.getByName(ip).isReachable(10000), message);
         } catch (IOException e) {
-            assertTrue(false, "IP " + ip + " not reachable");
+            fail(message);
         }
     }
 }