From f4b2029b02c2b4dcca3fe4dab2c448f559d7c22c Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 20 Mar 2024 12:17:56 +0100 Subject: [PATCH 1/2] Add tests for cakephp-ex repository. The tested matrix is: 7.4, to 8.0 branch "4.X" is used 8.1, 8.2, and above "5.X" branch is used the rest is master Signed-off-by: Petr "Stone" Hracek --- Makefile | 3 ++ tests/test_cakephp.py | 68 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 Makefile create mode 100644 tests/test_cakephp.py diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..97a95a66c --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +.PHONY: test-openshift-4 +test-openshift-4: + cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --verbose --color=yes --showlocals . \ No newline at end of file diff --git a/tests/test_cakephp.py b/tests/test_cakephp.py new file mode 100644 index 000000000..dbe2d48e3 --- /dev/null +++ b/tests/test_cakephp.py @@ -0,0 +1,68 @@ +import os + +import pytest +from pathlib import Path + +from container_ci_suite.openshift import OpenShiftAPI + +test_dir = Path(os.path.abspath(os.path.dirname(__file__))) + +VERSION = os.getenv("SINGLE_VERSION") +if not VERSION: + VERSION = "8.1-ubi8" + + +class TestCakePHPAppExTemplate: + + def setup_method(self): + self.oc_api = OpenShiftAPI(pod_name_prefix="cakephp-example") + json_raw_file = self.oc_api.get_raw_url_for_json(container="s2i-php-container", dir="imagestreams", + filename="php-rhel.json") + self.oc_api.import_is(path=json_raw_file, name="php") + + def teardown_method(self): + self.oc_api.delete_project() + + def test_template_inside_cluster(self): + branch_to_test = "master" + expected_output = "Welcome to PHP" + if VERSION.startswith("7.4") or VERSION.startswith("8.0"): + branch_to_test = "4.X" + expected_output = "Welcome to CakePHP 4.5" + if VERSION.startswith("8.1") or VERSION.startswith("8.2"): + branch_to_test = "5.X" + expected_output = "Welcome to CakePHP 5" + + template_json = self.oc_api.get_raw_url_for_json( + container="cakephp-ex", branch=branch_to_test, dir="openshift/templates", filename="cakephp.json" + ) + assert self.oc_api.deploy_template( + template=template_json, name_in_template="cakephp-example", expected_output=expected_output, + openshift_args=[f"SOURCE_REPOSITORY_REF={branch_to_test}", f"PHP_VERSION={VERSION}", "NAME=cakephp-example"] + ) + assert self.oc_api.template_deployed(name_in_template="cakephp-example") + assert self.oc_api.check_response_inside_cluster( + name_in_template="cakephp-example", expected_output=expected_output + ) + + def test_template_by_request(self): + branch_to_test = "master" + expected_output = "Welcome to PHP" + if VERSION.startswith("7.4") or VERSION.startswith("8.0"): + branch_to_test = "4.X" + expected_output = "Welcome to CakePHP 4.5" + elif VERSION.startswith("8.1") or VERSION.startswith("8.2"): + branch_to_test = "5.X" + expected_output = "Welcome to CakePHP 5" + + template_json = self.oc_api.get_raw_url_for_json( + container="cakephp-ex", branch=branch_to_test, dir="openshift/templates", filename="cakephp.json" + ) + assert self.oc_api.deploy_template( + template=template_json, name_in_template="cakephp-example", expected_output=expected_output, + openshift_args=[f"SOURCE_REPOSITORY_REF={branch_to_test}", f"PHP_VERSION={VERSION}", "NAME=cakephp-example"] + ) + assert self.oc_api.template_deployed(name_in_template="cakephp-example") + assert self.oc_api.check_response_outside_cluster( + name_in_template="cakephp-example", expected_output=expected_output + ) From 5cccfb0106555c5f6d6a27eeda8f335b981a5c9b Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 22 Mar 2024 11:52:47 +0100 Subject: [PATCH 2/2] Fix test stuite Signed-off-by: Petr "Stone" Hracek --- tests/test_cakephp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_cakephp.py b/tests/test_cakephp.py index dbe2d48e3..74c0a9cf4 100644 --- a/tests/test_cakephp.py +++ b/tests/test_cakephp.py @@ -28,7 +28,7 @@ def test_template_inside_cluster(self): expected_output = "Welcome to PHP" if VERSION.startswith("7.4") or VERSION.startswith("8.0"): branch_to_test = "4.X" - expected_output = "Welcome to CakePHP 4.5" + expected_output = "Welcome to CakePHP 4" if VERSION.startswith("8.1") or VERSION.startswith("8.2"): branch_to_test = "5.X" expected_output = "Welcome to CakePHP 5" @@ -50,7 +50,7 @@ def test_template_by_request(self): expected_output = "Welcome to PHP" if VERSION.startswith("7.4") or VERSION.startswith("8.0"): branch_to_test = "4.X" - expected_output = "Welcome to CakePHP 4.5" + expected_output = "Welcome to CakePHP 4" elif VERSION.startswith("8.1") or VERSION.startswith("8.2"): branch_to_test = "5.X" expected_output = "Welcome to CakePHP 5" @@ -64,5 +64,6 @@ def test_template_by_request(self): ) assert self.oc_api.template_deployed(name_in_template="cakephp-example") assert self.oc_api.check_response_outside_cluster( + protocol="https", name_in_template="cakephp-example", expected_output=expected_output )