diff --git a/tests/test_httpd_template.py b/tests/test_httpd_template.py index 93d50338..a699ee80 100644 --- a/tests/test_httpd_template.py +++ b/tests/test_httpd_template.py @@ -8,8 +8,6 @@ test_dir = Path(os.path.abspath(os.path.dirname(__file__))) VERSION=os.getenv("SINGLE_VERSION") -if not VERSION: - VERSION="2.4-el8" class TestHTTPDExTemplate: @@ -31,20 +29,7 @@ def test_httpd_ex_template_inside_cluster(self): template=template_json, name_in_template="httpd-example", expected_output="Welcome to your static httpd", openshift_args=["SOURCE_REPOSITORY_REF=master", f"HTTPD_VERSION={VERSION}", "NAME=httpd-example"] ) - assert self.oc_api.template_deployed(name_in_template="httpd-example") + assert self.oc_api.is_template_deployed(name_in_template="httpd-example") assert self.oc_api.check_response_inside_cluster( name_in_template="httpd-example", expected_output="Welcome to your static httpd" ) - - def test_httpd_ex_template_by_request(self): - template_json = self.oc_api.get_raw_url_for_json( - container="httpd-ex", dir="openshift/templates", filename="httpd.json" - ) - assert self.oc_api.deploy_template( - template=template_json, name_in_template="httpd-example", expected_output="Welcome to your static httpd", - openshift_args=["SOURCE_REPOSITORY_REF=master", f"HTTPD_VERSION={VERSION}", "NAME=httpd-example"] - ) - assert self.oc_api.template_deployed(name_in_template="httpd-example") - assert self.oc_api.check_response_outside_cluster( - name_in_template="httpd-example", expected_output="Welcome to your static httpd" - )