update tests

Author: mplsgrant

test/ln_test.py

@@ -7,6 +7,7 @@
 from test_base import TestBase
 
 from warnet.cli.process import run_command
+from warnet.k8s import get_pods_with_label
 
 
 class LNTest(TestBase):
@@ -102,18 +103,24 @@ def test_ln_payment_2_to_0(self):
             payment["fee_msat"] == "2213"
         ), f"Expected fee_msat to be 2213, got {payment['fee_msat']}"
 
-    # def test_simln(self):
-    #     self.log.info("Engaging simln")
-    #     node2pub, _ = json.loads(self.warnet("ln rpc 2 getinfo"))["uris"][0].split("@")
-    #     activity = [
-    #         {"source": "ln-0", "destination": node2pub, "interval_secs": 1, "amount_msat": 2000}
-    #     ]
-    #     self.warnet(
-    #         f"network export --exclude=[1] --activity={json.dumps(activity).replace(' ', '')}"
-    #     )
-    #     self.wait_for_predicate(lambda: self.check_invoices(2) > 1)
-    #     assert self.check_invoices(0) == 1, "Expected one invoice for node 0"
-    #     assert self.check_invoices(1) == 0, "Expected no invoices for node 1"
+    def test_simln(self):
+        self.log.info("Engaging simln")
+        pods = get_pods_with_label("mission=lightning")
+        node2pub = self.warnet(f"ln pubkey {pods[1].metadata.name}")
+        activity = [
+            {
+                "source": pods[0].metadata.name,
+                "destination": node2pub,
+                "interval_secs": 1,
+                "amount_msat": 2000,
+            }
+        ]
+        self.warnet(
+            f"network export --exclude=[1] --activity={json.dumps(activity).replace(' ', '')}"
+        )
+        self.wait_for_predicate(lambda: self.check_invoices(2) > 1)
+        assert self.check_invoices(0) == 1, "Expected one invoice for node 0"
+        assert self.check_invoices(1) == 0, "Expected no invoices for node 1"
 
     def check_invoice_settled(self):
         invs = json.loads(self.warnet("ln rpc tank-0002-ln listinvoices"))["invoices"]

test/simln_test.py

@@ -5,10 +5,9 @@
 from time import sleep
 
 import pexpect
-from kubernetes.stream import stream
 from test_base import TestBase
 
-from warnet.k8s import get_pods_with_label, get_static_client
+from warnet.k8s import get_pods_with_label
 from warnet.process import run_command
 
 
@@ -47,45 +46,9 @@ def check_simln_logs(self):
     def copy_results(self) -> bool:
         self.log.info("Copying results")
         sleep(20)
-        pod = get_pods_with_label("mission=plugin")[0]
-        v1 = get_static_client()
+        get_pods_with_label("mission=plugin")[0]
 
-        source_path = "/config/results"
         destination_path = "results"
-        os.makedirs(destination_path, exist_ok=True)
-        command = ["tar", "cf", "-", source_path]
-
-        # Create the stream
-        resp = stream(
-            v1.connect_get_namespaced_pod_exec,
-            name=pod.metadata.name,
-            namespace=pod.metadata.namespace,
-            command=command,
-            stderr=True,
-            stdin=False,
-            stdout=True,
-            tty=False,
-            _preload_content=False,
-        )
-
-        # Write the tar output to a file
-        tar_file = os.path.join(destination_path, "results.tar")
-        with open(tar_file, "wb") as f:
-            while resp.is_open():
-                resp.update(timeout=1)
-                if resp.peek_stdout():
-                    f.write(resp.read_stdout().encode("utf-8"))
-                if resp.peek_stderr():
-                    print(resp.read_stderr())
-
-            resp.close()
-
-        import tarfile
-
-        with tarfile.open(tar_file, "r") as tar:
-            tar.extractall(path=destination_path)
-
-        os.remove(tar_file)
 
         for root, _dirs, files in os.walk(destination_path):
             for file_name in files: