lint

Author: pinheadmz

resources/plugins/tor/plugin.py

@@ -1,12 +1,9 @@
 #!/usr/bin/env python3
 
 from pathlib import Path
-from warnet.process import run_command
 
+from warnet.process import run_command
 
 if __name__ == "__main__":
-    command = (
-        f"helm upgrade --install torda {Path(__file__).parent / 'charts' / 'torda'}"
-    )
+    command = f"helm upgrade --install torda {Path(__file__).parent / 'charts' / 'torda'}"
     run_command(command)
-

src/warnet/k8s.py

@@ -347,7 +347,9 @@ def get_ingress_ip_or_host():
         return None
 
 
-def pod_log(pod_name, container_name=None, follow=False, namespace: Optional[str] = None, tail_lines=None):
+def pod_log(
+    pod_name, container_name=None, follow=False, namespace: Optional[str] = None, tail_lines=None
+):
     namespace = get_default_namespace_or(namespace)
     sclient = get_static_client()
 
@@ -358,7 +360,7 @@ def pod_log(pod_name, container_name=None, follow=False, namespace: Optional[str
             container=container_name,
             follow=follow,
             _preload_content=False,
-            tail_lines=tail_lines
+            tail_lines=tail_lines,
         )
     except ApiException as e:
         raise Exception(json.loads(e.body.decode("utf-8"))["message"]) from None

test/onion_test.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 
 from test_base import TestBase
+
 from warnet.k8s import pod_log
 
 
@@ -26,10 +27,7 @@ def setup_network(self):
         self.wait_for_all_tanks_status(target="running")
 
     def check_tor(self):
-        onions = {
-            "tank-0001": None,
-            "tank-0002": None
-        }
+        onions = {"tank-0001": None, "tank-0002": None}
 
         def get_onions():
             peers = ["tank-0001", "tank-0002"]
@@ -41,10 +39,8 @@ def get_onions():
                         if "onion" in addr["address"]:
                             onions[tank] = addr["address"]
                             self.log.info(f" ... got: {addr['address']}")
-            for tank in peers:
-                if not onions[tank]:
-                    return False
-            return True
+            return all(onions[tank] for tank in peers)
+
         self.wait_for_predicate(get_onions)
 
         self.log.info("Adding 1 block")
@@ -67,15 +63,18 @@ def onion_connect():
             else:
                 self.log.info("tank-0001 tor log tail:")
                 stream = pod_log(
-                    pod_name="tank-0001", container_name="tor", namespace="default", follow=False, tail_lines=5
+                    pod_name="tank-0001",
+                    container_name="tor",
+                    namespace="default",
+                    follow=False,
+                    tail_lines=5,
                 )
                 for line in stream:
                     msg = line.decode("utf-8").rstrip()
                     msg = msg.split("]")
                     self.log.info(msg[-1])
 
-        self.wait_for_predicate(onion_connect, timeout=20*60)
-
+        self.wait_for_predicate(onion_connect, timeout=20 * 60)
 
 
 if __name__ == "__main__":