Remove some leftovers caused by review

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

Author: phracek

test/test_container_basics.py

@@ -15,11 +15,11 @@ def setup_method(self):
     def teardown_method(self):
         self.app.cleanup()
 
-    def test_run_s2i_usage(self, app):
+    def test_run_s2i_usage(self):
         """
         Test if s2i usage works
         """
-        output = app.s2i_usage()
+        output = self.app.s2i_usage()
         assert output != ""
 
     def test_docker_run_usage(self):
@@ -47,7 +47,7 @@ def test_scl_usage(self):
             "Dockerfile.s2i"
         ]
     )
-    def test_dockerfiles(self, app, dockerfile):
+    def test_dockerfiles(self, dockerfile):
         """
         Test if building nginx-container based on
         examples/Dockerfile works
@@ -58,11 +58,11 @@ def test_dockerfiles(self, app, dockerfile):
         dp.update_variable_in_dockerfile(version=version, variable="NGINX_VERSION")
         new_docker_file = dp.create_temp_dockerfile()
 
-        assert app.build_test_container(
+        assert self.app.build_test_container(
             dockerfile=new_docker_file, app_url="https://github.com/sclorg/nginx-container.git",
             app_dir="nginx-container"
         )
-        assert app.test_app_dockerfile()
-        cip = app.get_cip()
+        assert self.app.test_app_dockerfile()
+        cip = self.app.get_cip()
         assert cip
-        assert app.test_response(url=cip, expected_output="NGINX is working")
+        assert self.app.test_response(url=cip, expected_output="NGINX is working")

test/test_container_example_apps.py

@@ -40,9 +40,9 @@ def setup_method(self):
     def teardown_method(self):
         self.s2i_app.cleanup()
 
-    def test_run_app_test(self, example_app_test):
+    def test_run_app_test(self):
         version = VERSION.replace("-micro", "")
-        cid_file_name = example_app_test.app_name
+        cid_file_name = self.s2i_app.app_name
         # Create container with --user 10001
         assert self.s2i_app.create_container(cid_file_name=cid_file_name, container_args="--user 10001")
         # Wait till container does not start
@@ -59,7 +59,7 @@ def test_run_app_test(self, example_app_test):
         # Checks if nginx configuration DO NOT container "DNS_SERVER"
         assert not re.search("DNS_SERVER", command)
         assert PodmanCLIWrapper.podman_run_command(
-            f"--rm {example_app_test.image_name} /bin/bash -c 'nginx -v'"
+            f"--rm {self.s2i_app.image_name} /bin/bash -c 'nginx -v'"
         ).startswith(f"nginx version: nginx/{version}")
         assert self.s2i_app.test_response(
             url=f"http://{cip}", expected_output="NGINX is working"
@@ -111,9 +111,9 @@ def setup_method(self):
     def teardown_method(self):
         self.s2i_app.cleanup()
 
-    def test_log_output(self, s2i_log_test):
+    def test_log_output(self):
         cid_file_name = "test-app"
-        s2i_log_test.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file_name}")
+        self.s2i_app.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file_name}")
         assert self.s2i_app.create_container(
             cid_file_name=cid_file_name,
             container_args="--user 10001"
@@ -124,7 +124,7 @@ def test_log_output(self, s2i_log_test):
         assert self.s2i_app.test_response(
             url=f"http://{cip}", port=8080, expected_output="NGINX is working"
         )
-        assert '"GET / HTTP/1.1" 200' in s2i_log_test.get_logs(cid_file_name=cid_file_name)
+        assert '"GET / HTTP/1.1" 200' in self.s2i_app.get_logs(cid_file_name=cid_file_name)
         # Check if /nothing-at-all is really no accessible
         assert self.s2i_app.test_response(
             url=f"http://{cip}", port=8080, page="/nothing-at-all", expected_code=404
@@ -134,9 +134,9 @@ def test_log_output(self, s2i_log_test):
         # Checks logs container 'failed' and 'No such file or directory'
         assert re.search("open.*failed.*No such file or directory", logs)
 
-    def test_log_volume_output(self, s2i_log_test):
+    def test_log_volume_output(self):
         cid_file_name = "test-app"
-        s2i_log_test.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file_name}")
+        self.s2i_app.set_new_image(image_name=f"{IMAGE_NAME}-{cid_file_name}")
         assert self.s2i_app.create_container(
             cid_file_name=cid_file_name,
             container_args="-e NGINX_LOG_TO_VOLUME=y --user 10001"