improve test

Sleep a bit to allow simln to process

Author: mplsgrant

resources/plugins/simln/simln.py

@@ -6,7 +6,7 @@
 from time import sleep
 
 from warnet.hooks import _get_plugin_directory as get_plugin_directory
-from warnet.k8s import get_pods_with_label
+from warnet.k8s import get_pods_with_label, wait_for_pod
 from warnet.process import run_command
 from warnet.status import _get_tank_status as network_status
 
@@ -43,12 +43,15 @@ def run_simln():
     log.info("done waiting")
     pod_name = prepare_and_launch_activity()
     log.info(pod_name)
+    wait_for_pod(pod_name, 60)
 
 
 def prepare_and_launch_activity() -> str:
     pods = get_pods_with_label(lightning_selector)
-    pod_a = pods[0].metadata.name
-    pod_b = pods[1].metadata.name
+    pod_a = pods[1].metadata.name
+    pod_b = pods[2].metadata.name
+    log.info(f"pod_a: {pod_a}")
+    log.info(f"pod_b: {pod_b}")
     sample_activity = [
         {"source": pod_a, "destination": pod_b, "interval_secs": 1, "amount_msat": 2000}
     ]
@@ -65,7 +68,7 @@ def launch_activity(activity: list[dict]) -> str:
     command = f"helm upgrade --install simln-{random_digits} {plugin_dir}/simln/charts/simln"
     log.info(f"generate activity: {command}")
     run_command(command)
-    return f"pod/simln-simln-{random_digits}"
+    return f"simln-simln-{random_digits}"
 
 
 def init_network():

src/warnet/k8s.py

@@ -569,7 +569,6 @@ def download(pod_name: str, namespace: str, source_path: Path, destination_path:
 
     v1 = get_static_client()
 
-    os.makedirs(destination_path, exist_ok=True)
     target_folder = destination_path / source_path.stem
     os.makedirs(target_folder, exist_ok=True)
 

test/simln_test.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-
+import json
 import os
 from pathlib import Path
 from subprocess import run
@@ -8,7 +8,10 @@
 import pexpect
 from test_base import TestBase
 
-from warnet.k8s import download, get_pods_with_label
+from warnet.k8s import download, get_pods_with_label, pod_log, wait_for_pod
+from warnet.process import run_command
+
+lightning_selector = "mission=lightning"
 
 
 class LNTest(TestBase):
@@ -42,8 +45,15 @@ def run_plugin(self):
 
     def copy_results(self) -> bool:
         self.log.info("Copying results")
-        sleep(20)
         pod = get_pods_with_label("mission=plugin")[0]
+        self.wait_for_gossip_sync(2)
+        wait_for_pod(pod.metadata.name, 60)
+        sleep(20)
+
+        log_resp = pod_log(pod.metadata.name, "simln")
+        self.log.info(log_resp.data.decode("utf-8"))
+        self.log.info("Sleep to process results")
+        sleep(60)
 
         download(pod.metadata.name, pod.metadata.namespace, Path("/working/results"), Path("."))
 
@@ -57,6 +67,20 @@ def copy_results(self) -> bool:
                         return True
         return False
 
+    def wait_for_gossip_sync(self, expected: int):
+        self.log.info(f"Waiting for sync (expecting {expected})...")
+        current = 0
+        while current < expected:
+            current = 0
+            pods = get_pods_with_label(lightning_selector)
+            for v1_pod in pods:
+                node = v1_pod.metadata.name
+                chs = json.loads(run_command(f"warnet ln rpc {node} describegraph"))["edges"]
+                self.log.info(f"{node}: {len(chs)} channels")
+                current += len(chs)
+            sleep(1)
+        self.log.info("Synced")
+
 
 if __name__ == "__main__":
     test = LNTest()