tests fixes

Author: blafry

tests/conftest.py

@@ -190,7 +190,7 @@ def k8s_server(
         {
             "server.enabled": True,
             "networkPolicies.enabled": True,
-            "server.wg.publicHost": "wormhole-server-server.server.svc.cluster.local",
+            "server.wg.publicHost": "wormhole-server.server.svc.cluster.local",
             "server.service.type": "ClusterIP",
             "docker.image": wormhole_image.split(":")[0],
             "docker.version": wormhole_image.split(":")[1],
@@ -220,7 +220,7 @@ def k8s_client(
             "client.enabled": True,
             "networkPolicies.enabled": True,
             "client.name": "client",
-            "client.serverDsn": "http://wormhole-server-server.server.svc.cluster.local:8080",
+            "client.serverDsn": "http://wormhole-server.server.svc.cluster.local:8080",
             "docker.image": wormhole_image.split(":")[0],
             "docker.version": wormhole_image.split(":")[1],
             "docker.wgImage": wireguard_image.split(":")[0],

tests/test_kubernetes.py

@@ -247,17 +247,17 @@ def test_reconnecting_clients_with_keys(
     @retry(tries=int(DEFAULT_RETRY_TRIES / 10), delay=DEFAULT_RETRY_DELAY)
     def _wait_for_peers_paired_using_psk():
         assert "Paired with server, assigned IP" in kubectl.run(
-            ["-n", "client", "logs", "-l", "application=wormhole-client-client", "-c", "wormhole"]
+            ["-n", "client", "logs", "-l", "application=wormhole-client", "-c", "wormhole"]
         ).stdout.decode()
 
     _wait_for_peers_paired_using_psk()
 
-    kubectl.run(["-n", "client", "delete", "pod", "-l", "application=wormhole-client-client"])
+    kubectl.run(["-n", "client", "delete", "pod", "-l", "application=wormhole-client"])
 
     @retry(tries=int(DEFAULT_RETRY_TRIES / 10), delay=DEFAULT_RETRY_DELAY)
     def _wait_for_peers_paired_using_keys():
         assert "using IP from the cache" in kubectl.run(
-            ["-n", "client", "logs", "-l", "application=wormhole-client-client", "-c", "wormhole"]
+            ["-n", "client", "logs", "-l", "application=wormhole-client", "-c", "wormhole"]
         ).stdout.decode()
 
     _wait_for_peers_paired_using_keys()