Skip to content

Fix test suite for testing PHP application #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phracek merged 2 commits into from
Aug 7, 2025
Merged

Fix test suite for testing PHP application #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8258bfe
Fix test suite for testing PHP application.
phracek Aug 6, 2025
e51c66d
Fix PHP test suite. Skipp mysql tests for now.
phracek Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.PHONY: test-openshift-4
test-openshift-4:
cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --verbose --color=yes --showlocals .
.PHONY: test-openshift-pytest
test-openshift-pytest:
cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest -s -rA --showlocals -vv test_cakephp.py
53 changes: 3 additions & 50 deletions tests/test_cakephp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,18 @@ 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")
self.oc_api.import_is(path=json_raw_file, name="php", skip_check=True)

def teardown_method(self):
self.oc_api.delete_project()

def test_local_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"
if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
branch_to_test = "5.X"
expected_output = "Welcome to CakePHP 5"

template_json = "../openshift/templates/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_remote_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"
if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
if VERSION.startswith("8.1") or VERSION.startswith("8.2") or VERSION.startswith("8.3"):
branch_to_test = "5.X"
expected_output = "Welcome to CakePHP 5"

Expand All @@ -64,30 +40,7 @@ def test_remote_template_inside_cluster(self):
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.is_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_remote_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"
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(
protocol="https",
name_in_template="cakephp-example", expected_output=expected_output
)
69 changes: 10 additions & 59 deletions tests/test_cakephp_mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,24 @@ 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")
self.oc_api.import_is(path=json_raw_file, name="php", skip_check=True)
json_raw_file = self.oc_api.get_raw_url_for_json(
container="mysql-container", dir="imagestreams", filename="mysql-rhel.json"
)
self.oc_api.import_is(path=json_raw_file, name="mysql")
self.oc_api.import_is(path=json_raw_file, name="mysql", skip_check=True)

def teardown_method(self):
self.oc_api.delete_project()

def test_local_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"
if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
branch_to_test = "5.X"
expected_output = "Welcome to CakePHP 5"
template_json = "../openshift/templates/cakephp-mysql-persistent.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",
"MYSQL_VERSION=8.0-el8"
]
)
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_remote_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"
if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
expected_output = "Welcome to CakePHP"
if VERSION.startswith("8.1") or VERSION.startswith("8.2") or VERSION.startswith("8.3"):
branch_to_test = "5.X"
expected_output = "Welcome to CakePHP 5"
expected_output = "Welcome to CakePHP"

template_json = self.oc_api.get_raw_url_for_json(
container="cakephp-ex", branch=branch_to_test, dir="openshift/templates", filename="cakephp-mysql-persistent.json"
Expand All @@ -70,38 +46,13 @@ def test_remote_template_inside_cluster(self):
f"SOURCE_REPOSITORY_REF={branch_to_test}",
f"PHP_VERSION={VERSION}",
"NAME=cakephp-example",
"MYSQL_VERSION=8.0-el8"
"MYSQL_VERSION=8.0-el8",
"DATABASE_USER=testu",
"DATABASE_PASSWORD=testp",
"DATABASE_NAME=mysql"
]
)
assert self.oc_api.template_deployed(name_in_template="cakephp-example")
assert self.oc_api.is_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_remote_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"
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-mysql-persistent.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",
"MYSQL_VERSION=8.0-el8"
]
)
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
)