Some pre-commit Python fixes

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

test/test_container_httpd_s2i.py

@@ -168,6 +168,8 @@ def test_self_cert_test(self):
         server_cert = ContainerTestLibUtils.run_command(
             cmd=f"openssl x509 -inform pem -noout -text -in {Path(certificate_dir)}/output"
         )
-        config_cmd = f"openssl x509 -in {TEST_DIR}/{self.s2i_app.app_name}/httpd-ssl/certs/server-cert-selfsigned.pem -inform pem -noout -text"
+        pem_file = f"{TEST_DIR}/{self.s2i_app.app_name}/httpd-ssl/certs/server-cert-selfsigned.pem"
+        assert Path(pem_file).exists()
+        config_cmd = f"openssl x509 -in {pem_file} -inform pem -noout -text"
         config_cert = ContainerTestLibUtils.run_command(cmd=config_cmd)
         assert server_cert == config_cert

test/test_ocp_ex_template.py

@@ -1,8 +1,6 @@
 import os
 import sys
 
-import pytest
-
 from pathlib import Path
 
 from container_ci_suite.openshift import OpenShiftAPI
@@ -19,7 +17,6 @@
 
 
 class TestHTTPDExExampleRepo:
-
     def setup_method(self):
         self.template_name = get_service_image(IMAGE_NAME)
         self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)
@@ -30,10 +27,11 @@ def teardown_method(self):
     def test_httpd_ex_template_inside_cluster(self):
         assert self.oc_api.deploy_s2i_app(
             image_name=IMAGE_NAME,
-            app=f"https://github.com/sclorg/httpd-ex#master",
-            context="."
+            app="https://github.com/sclorg/httpd-ex#master",
+            context=".",
         )
         assert self.oc_api.is_template_deployed(name_in_template=self.template_name)
         assert self.oc_api.check_response_inside_cluster(
-            name_in_template=self.template_name, expected_output="Welcome to your static httpd"
+            name_in_template=self.template_name,
+            expected_output="Welcome to your static httpd",
         )

test/test_ocp_imagestream_s2i.py

@@ -1,8 +1,6 @@
 import os
 import sys
 
-import pytest
-
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import get_service_image, check_variables
 
@@ -17,7 +15,6 @@
 
 
 class TestHTTPDImagestreamS2I:
-
     def setup_method(self):
         self.template_name = get_service_image(IMAGE_NAME)
         self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)
@@ -26,15 +23,16 @@ def teardown_method(self):
         self.oc_api.delete_project()
 
     def test_inside_cluster(self):
-        os_name = ''.join(i for i in OS if not i.isdigit())
+        os_name = "".join(i for i in OS if not i.isdigit())
         assert self.oc_api.deploy_imagestream_s2i(
             imagestream_file=f"imagestreams/httpd-{os_name}.json",
             image_name=IMAGE_NAME,
             app="https://github.com/sclorg/httpd-container.git",
             context="examples/sample-test-app",
-            service_name=self.template_name
+            service_name=self.template_name,
         )
         assert self.oc_api.is_s2i_pod_running(pod_name_prefix=self.template_name)
         assert self.oc_api.check_response_inside_cluster(
-            name_in_template=self.template_name, expected_output="This is a sample s2i application with static content"
+            name_in_template=self.template_name,
+            expected_output="This is a sample s2i application with static content",
         )

test/test_ocp_integration.py

@@ -15,7 +15,6 @@
 
 
 class TestHTTPDIntegrationTemplate:
-
     def setup_method(self):
         self.template_name = get_service_image(IMAGE_NAME)
         self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)
@@ -26,10 +25,11 @@ def teardown_method(self):
     def test_httpd_ex_template_inside_cluster(self):
         assert self.oc_api.deploy_s2i_app(
             image_name=IMAGE_NAME,
-            app=f"https://github.com/sclorg/httpd-container.git",
-            context="examples/sample-test-app"
+            app="https://github.com/sclorg/httpd-container.git",
+            context="examples/sample-test-app",
         )
         assert self.oc_api.is_template_deployed(name_in_template=self.template_name)
         assert self.oc_api.check_response_inside_cluster(
-            name_in_template=self.template_name, expected_output="This is a sample s2i application with static content"
+            name_in_template=self.template_name,
+            expected_output="This is a sample s2i application with static content",
         )