Merge pull request #33 from digitronik/string_formatting

removed py2 :D moved to f-string

.github/workflows/unit_checks.yml

@@ -1,6 +1,6 @@
 name: miqsel
 
-on: [push, pull_request]
+on: push
 
 jobs:
   pre-commit:

miqsel/env.py

@@ -139,7 +139,7 @@ def browser(browser):
     env = LocalEnv()
 
     if browser:
-        click.echo("Browser set to {}".format(browser))
+        click.echo(f"Browser set to {browser}")
         env.browser = browser
     else:
         click.echo(env.browser)
@@ -156,7 +156,7 @@ def appliance(app):
     env = LocalEnv()
 
     if app:
-        click.echo("Appliance set to {}".format(app))
+        click.echo(f"Appliance set to {app}")
         env.appliance = app
     else:
         click.echo(env.appliance)

miqsel/server.py

@@ -45,9 +45,7 @@ def executor(self):
         """
 
         return (
-            "http://{host}:{port}/wd/hub".format(
-                host=self.hostname, port=self.cfg["container"]["server_port"]
-            )
+            f"http://{self.hostname}:{self.cfg['container']['server_port']}/wd/hub"
             if self.hostname
             else None
         )
@@ -59,11 +57,7 @@ def vnc(self):
         :return: If container running return vnc url else None
         """
 
-        return (
-            "{host}:{port}".format(host=self.hostname, port=self.cfg["container"]["vnc_port"])
-            if self.hostname
-            else None
-        )
+        return f"{self.hostname}:{self.cfg['container']['vnc_port']}" if self.hostname else None
 
     def start(self, **kwargs):
         """Start selenium container"""

tests/conftest.py

@@ -14,7 +14,7 @@ def config():
     if not os.path.isdir("conf"):
         os.mkdir("conf")
     proc = Popen(["miqsel", "config"], stdin=PIPE, stdout=PIPE)
-    input = str.encode("{}\n\n\n\n\n".format(os.getcwd()))
+    input = str.encode(f"{os.getcwd()}\n\n\n\n\n")
     proc.communicate(input=input)
     yield
     if os.path.isdir("conf"):

tests/test_configured.py

@@ -14,7 +14,7 @@
 def test_miqsel(state, proj_dir, ensure_stopped):
     """Check start and stop of unconfigured miqsel but run from project"""
 
-    cmd = "miqsel {}".format(state)
+    cmd = f"miqsel {state}"
     out, _, returncode = miqsel_cmd(cmd)
     assert returncode == 0
     assert DATA[state]["msg"] in out
@@ -46,9 +46,9 @@ def test_appliance(proj_dir, ensure_stopped):
 
     # with appliance set
     app = "192.168.1.1"
-    out, _, returncode = miqsel_cmd("miqsel appliance -s {}".format(app))
+    out, _, returncode = miqsel_cmd(f"miqsel appliance -s {app}")
     assert returncode == 0
-    assert out.strip() == "Appliance set to {}".format(app)
+    assert out.strip() == f"Appliance set to {app}"
     out, _, returncode = miqsel_cmd("miqsel appliance")
     assert out.strip() == app
 

tests/test_unconfigured.py

@@ -20,7 +20,7 @@ def test_miqsel_help():
 def test_miqsel_status(state, ensure_stopped):
     """Check Status of unconfigured miqsel"""
 
-    cmd = "miqsel {}".format(state)
+    cmd = f"miqsel {state}"
     miqsel_cmd(cmd)
     out, _, returncode = miqsel_cmd("miqsel status")
     assert returncode == 0
@@ -30,7 +30,7 @@ def test_miqsel_status(state, ensure_stopped):
 @pytest.mark.parametrize("state", DATA)
 def test_miqsel(state, ensure_stopped):
     """Check start and stop of unconfigured miqsel"""
-    cmd = "miqsel {}".format(state)
+    cmd = f"miqsel {state}"
     out, _, returncode = miqsel_cmd(cmd)
     assert returncode == 0