more pylint cleanup

Signed-off-by: Bas Zoetekouw <[email protected]>

tests/conftest.py

@@ -5,6 +5,7 @@
 # pylint: disable=redefined-outer-name
 from pathlib import Path
 import os
+
 import pytest
 
 

tests/test_podman_compose.py

@@ -1,15 +1,6 @@
 from pathlib import Path
-import subprocess
 
-
-def capture(command):
-    proc = subprocess.Popen(
-        command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    out, err = proc.communicate()
-    return out, err, proc.returncode
+from utils import capture
 
 
 def test_podman_compose_extends_w_file_subdir():
@@ -52,7 +43,7 @@ def test_podman_compose_extends_w_file_subdir():
     out, _, returncode = capture(command_up)
     assert 0 == returncode
     # check container was created and exists
-    out, err, returncode = capture(command_check_container)
+    out, _, returncode = capture(command_check_container)
     assert 0 == returncode
     assert b'localhost/subdir_test:me\n' == out
     out, _, returncode = capture(command_down)

tests/test_podman_compose_include.py

@@ -1,15 +1,6 @@
 from pathlib import Path
-import subprocess
 
-
-def capture(command):
-    proc = subprocess.Popen(
-        command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    out, err = proc.communicate()
-    return out, err, proc.returncode
+from utils import capture
 
 
 def test_podman_compose_include():

tests/test_podman_compose_tests.py

@@ -19,10 +19,10 @@ def test_exit_from(podman_compose_path, test_path):
         "up"
     ]
 
-    out, _, return_code = capture(up_cmd + ["--exit-code-from", "sh1"])
+    _, _, return_code = capture(up_cmd + ["--exit-code-from", "sh1"])
     assert return_code == 1
 
-    out, _, return_code = capture(up_cmd + ["--exit-code-from", "sh2"])
+    _, _, return_code = capture(up_cmd + ["--exit-code-from", "sh2"])
     assert return_code == 2
 
 
@@ -105,11 +105,11 @@ def test_up_with_ports(podman_compose_path, test_path):
     ]
 
     try:
-        out, _, return_code = capture(up_cmd)
+        _, _, return_code = capture(up_cmd)
         assert return_code == 0
 
     finally:
-        out, _, return_code = capture(down_cmd)
+        _, _, return_code = capture(down_cmd)
         assert return_code == 0
 
 
@@ -136,18 +136,18 @@ def test_down_with_vols(podman_compose_path, test_path):
     ]
 
     try:
-        out, _, return_code = capture(["podman", "volume", "create", "my-app-data"])
+        _, _, return_code = capture(["podman", "volume", "create", "my-app-data"])
         assert return_code == 0
-        out, _, return_code = capture(["podman", "volume", "create", "actual-name-of-volume"])
+        _, _, return_code = capture(["podman", "volume", "create", "actual-name-of-volume"])
         assert return_code == 0
 
-        out, _, return_code = capture(up_cmd)
+        _, _, return_code = capture(up_cmd)
         assert return_code == 0
 
         capture(["podman", "inspect", "volume", ""])
 
     finally:
-        out, _, return_code = capture(down_cmd)
+        _, _, return_code = capture(down_cmd)
         capture(["podman", "volume", "rm", "my-app-data"])
         capture(["podman", "volume", "rm", "actual-name-of-volume"])
         assert return_code == 0
@@ -170,7 +170,7 @@ def test_down_with_orphans(podman_compose_path, test_path):
         "--remove-orphans"
     ]
 
-    out, _, return_code = capture(down_cmd)
+    _, _, return_code = capture(down_cmd)
     assert return_code == 0
 
     _, _, exists = capture(["podman", "container", "exists", container_id.decode("utf-8")])

tests/utils.py

@@ -0,0 +1,11 @@
+import subprocess
+
+
+def capture(command):
+    proc = subprocess.Popen(
+        command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+    out, err = proc.communicate()
+    return out, err, proc.returncode