Container PyTest for Nginx-container by phracek · Pull Request #346 · sclorg/nginx-container

phracek · 2025-09-11T13:52:15Z

This pull request contains set of PyTest from migration bash tests to PyTest.

The migration matrix is:

TEST_LIST_APP="\
test_s2i_usage -> test_container_basics.py(TestNginxContainer.test_run_s2i_usage)
test_docker_run_usage -> test_container_basics.py(TestNginxContainer.test_docker_run_usage)
test_scl_usage -> test_container_basics.py(TestNginxContainer.test_scl_usage)
test_application -> test_container_application.py(TestNginxApplicationContainer.test_application)
test_log_output -> test_container_log.py(TestNginxLogContainer.test_log_output)
test_log_volume_output -> test_container_log.py(TestNginxLogContainer.test_log_volume_output)
test_application_user ->  test_container_application.py(TestNginxApplicationContainer.test_application_user)
"
TEST_LIST_HOOK_APP="test_pre_init_script" -> test_container_example_app.py(TestNginxExampleAppContainer.test_run_app_test)
TEST_LIST_PERL_APP="test_perl_directive" -> test_container_example_app.py(TestNginxExamplePerlAppContainer.test_run_app_test)
TEST_LIST_MISC=run_dockerfiles_test -> test_container_basics.py(TestNginxContainer.test_dockerfiles)

Also OpenShift Pytest were renamed to test_ocp_*.py

phracek · 2025-09-11T13:54:58Z

[test-pytest]

github-actions · 2025-09-11T13:55:22Z

Pull Request validation

Failed

🔴 Failed or pending statuses:

Testing Farm - RHEL8 - OpenShift 4 - 1.22[pending]
Testing Farm - RHEL8 - PyTest - 1.24[pending]
Testing Farm - RHEL10 - PyTest - 1.26[pending]
Testing Farm - RHEL8 - OpenShift 4 - 1.24[pending]
Testing Farm - RHEL10 - OpenShift 4 - 1.26[pending]
Testing Farm - RHEL8 - OpenShift 4 - 1.22-micro[pending]
Testing Farm - RHEL9 - PyTest - 1.24[pending]

🔴 Review - Missing review from a member (1 required)

github-actions · 2025-09-11T14:01:46Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
Fedora - PyTest - 1.26	Fedora-latest	x86_64	✅ passed	16.10.2025 11:10:56	6min 53s	test pipeline
CentOS Stream 10 - PyTest - 1.26	CentOS-Stream-10	x86_64	✅ passed	16.10.2025 11:31:22	8min 45s	test pipeline
CentOS Stream 9 - PyTest - 1.24	CentOS-Stream-9	x86_64	✅ passed	16.10.2025 10:54:12	10min 3s	test pipeline
CentOS Stream 9 - PyTest - 1.22-micro	CentOS-Stream-9	x86_64	✅ passed	16.10.2025 11:46:49	9min 42s	test pipeline
CentOS Stream 9 - PyTest - 1.26	CentOS-Stream-9	x86_64	✅ passed	16.10.2025 11:46:39	8min 47s	test pipeline
RHEL10 - PyTest - 1.26	RHEL-10-Nightly	x86_64	✅ passed	16.10.2025 11:01:31	11min 55s	test pipeline
RHEL8 - PyTest - 1.22	RHEL-8.10.0-Nightly	x86_64	✅ passed	16.10.2025 11:48:59	14min 27s	test pipeline
RHEL8 - PyTest - 1.22-micro	RHEL-8.10.0-Nightly	x86_64	✅ passed	16.10.2025 11:32:26	17min 19s	test pipeline
RHEL8 - PyTest - 1.24	RHEL-8.10.0-Nightly	x86_64	✅ passed	16.10.2025 11:00:22	14min 43s	test pipeline
RHEL9 - Unsubscribed host - 1.26	RHEL-9.6.0-Nightly	x86_64	✅ passed	11.09.2025 13:55:12	17min 39s	test pipeline
RHEL9 - Unsubscribed host - 1.20	RHEL-9.6.0-Nightly	x86_64	✅ passed	11.09.2025 13:55:18	17min 18s	test pipeline
RHEL9 - PyTest - 1.22	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:35:01	19min 4s	test pipeline
RHEL9 - Unsubscribed host - 1.22	RHEL-9.6.0-Nightly	x86_64	✅ passed	11.09.2025 13:56:33	16min 49s	test pipeline
RHEL9 - PyTest - 1.24	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:06:54	16min 18s	test pipeline
RHEL9 - PyTest - 1.20	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:42:03	16min 21s	test pipeline
RHEL9 - PyTest - 1.26	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:38:10	16min 34s	test pipeline
RHEL9 - Unsubscribed host - PyTest - 1.20	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:35:20	16min 30s	test pipeline
RHEL9 - Unsubscribed host - PyTest - 1.24	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:13:54	15min 41s	test pipeline
RHEL9 - Unsubscribed host - PyTest - 1.26	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:53:30	16min 13s	test pipeline
RHEL9 - Unsubscribed host - PyTest - 1.22	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:40:07	15min 2s	test pipeline
RHEL10 - OpenShift 4 - 1.26	RHEL-10-Nightly	x86_64	✅ passed	16.10.2025 11:03:53	18min 18s	test pipeline
RHEL8 - OpenShift 4 - 1.22	RHEL-8.10.0-Nightly	x86_64	✅ passed	16.10.2025 11:00:21	20min 41s	test pipeline
RHEL9 - OpenShift 4 - 1.22	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:08:41	21min 38s	test pipeline
RHEL9 - OpenShift 4 - 1.20	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:10:55	21min 49s	test pipeline
RHEL8 - OpenShift 4 - 1.22-micro	RHEL-8.10.0-Nightly	x86_64	✅ passed	16.10.2025 11:04:00	21min 52s	test pipeline
RHEL8 - OpenShift 4 - 1.24	RHEL-8.10.0-Nightly	x86_64	✅ passed	16.10.2025 11:01:41	20min 57s	test pipeline
RHEL9 - OpenShift 4 - 1.24	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:33:20	25min 57s	test pipeline
RHEL9 - OpenShift 4 - 1.26	RHEL-9.6.0-Nightly	x86_64	✅ passed	16.10.2025 11:36:23	22min 24s	test pipeline

phracek · 2025-09-16T11:13:13Z

[test-pytest]

phracek · 2025-09-16T13:04:19Z

Let's test it again after fixing VERSION and micro

[test-pytest]

phracek · 2025-09-16T14:04:03Z

/auto-merge

phracek · 2025-09-19T07:47:42Z

[test-pytest]

phracek · 2025-10-07T08:42:47Z

$ pre-commit run --config ~/.pre-commit-config.yaml --files test/test_container_application.py test/test_container_basics.py test/test_container_example_apps.py
Check for added large files..............................................Passed
Check for merge conflicts................................................Passed
Check python ast.........................................................Passed
Check Yaml...........................................(no files to check)Skipped
Detect Private Key.......................................................Passed
Fix End of Files.........................................................Passed
Trim Trailing Whitespace.................................................Passed
Flake8...................................................................Passed
mypy.....................................................................Passed

phracek · 2025-10-07T08:43:00Z

[test-pytest]

phracek · 2025-10-07T09:56:06Z

After removing some leftovers, let's test it again.
[test-pytest]

phracek · 2025-10-08T12:35:59Z

[test-pytest]

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

All PyTest have naming `test_container_*.py` Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

phracek · 2025-10-14T10:15:04Z

The suite were completelly rewritten based on s2i-python-container improvements sclorg/s2i-python-container#759

[test-pytest][test-openshift]

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

phracek · 2025-10-15T08:17:22Z

@frenzymadness The tests have been rewritten based on your small improvements in s2i-python-container.
Similar like s2i-perl-container.

All was also checked by pre-commit scripts. So it should be easy to review.

So PTAL. Not urgent.

phracek · 2025-10-15T08:17:31Z

[test-pytest][test-openshift]

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

phracek · 2025-10-16T10:45:59Z

[test-pytest][test-openshift]

frenzymadness

It's good overall. I found just a few possible improvements.

frenzymadness · 2025-10-17T07:04:45Z

test/run-pytest

+
+THISDIR=$(dirname ${BASH_SOURCE[0]})
+
+git show -s


I'm not sure what this is good for. The information about the last commit is usually available in the CI, and you typically don't need it in the output.

frenzymadness · 2025-10-17T07:12:08Z

test/test_container_example_apps.py

+        command = PodmanCLIWrapper.podman_get_file_content(
+            cid_file_name=cid, filename="/opt/app-root/etc/nginx.d/default.conf"
+        )
+        # Checks if nginx configuration contains resolver
+        assert re.search("resolver", command)
+        # Checks if nginx configuration DO NOT container "DNS_SERVER"
+        assert not re.search("DNS_SERVER", command)


command is not a very good descriptive name for this variable.

Suggested change

command = PodmanCLIWrapper.podman_get_file_content(

cid_file_name=cid, filename="/opt/app-root/etc/nginx.d/default.conf"

)

# Checks if nginx configuration contains resolver

assert re.search("resolver", command)

# Checks if nginx configuration DO NOT container "DNS_SERVER"

assert not re.search("DNS_SERVER", command)

nginx_config = PodmanCLIWrapper.podman_get_file_content(

cid_file_name=cid, filename="/opt/app-root/etc/nginx.d/default.conf"

)

# Checks if nginx configuration contains resolver

assert re.search("resolver", nginx_config)

# Checks if nginx configuration DO NOT container "DNS_SERVER"

assert not re.search("DNS_SERVER", nginx_config)

frenzymadness · 2025-10-17T07:14:02Z

test/test_container_example_apps.py

+
+    def test_run_app_test(self):
+        if VARS.VERSION.endswith("-micro"):
+            pytest.skip("Run the chosen tests (not for micro variant which lacks perl)")


Suggested change

pytest.skip("Run the chosen tests (not for micro variant which lacks perl)")

pytest.skip("Micro image variant lacks Perl.")

frenzymadness · 2025-10-17T07:16:42Z

test/test_container_example_apps.py

+            url=f"http://{cip}", port=8080, page="/nothing-at-all", expected_code=404
+        )
+        logs = self.s2i_app.get_logs(cid_file_name=cid_file_name)
+        assert logs


This is kinda duplicate. If logs is empty, the next assert fails because it won't find anything in an empty string.

frenzymadness · 2025-10-17T07:20:46Z

test/test_ocp_imagestreams.py

+class TestLatestImagestreams:
+
+    def setup_method(self):
+        self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR / ".." / "..")


Suggested change

self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR / ".." / "..")

self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR.parent.parent)

frenzymadness · 2025-10-17T07:21:06Z

test/test_ocp_imagestreams.py

+        Test checks we have the latest imagestream in GitHub repository
+        """
+        self.latest_version = self.isc.get_latest_version()
+        assert self.latest_version != ""


Suggested change

assert self.latest_version != ""

assert self.latest_version

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

phracek force-pushed the container_pytests branch 3 times, most recently from 6d1b8be to a9b364b Compare September 11, 2025 13:54

github-actions bot added pr/failing-ci pr/missing-review labels Sep 11, 2025

github-actions bot removed the pr/failing-ci label Sep 16, 2025

github-actions bot added the pr/failing-ci label Sep 16, 2025

phracek force-pushed the container_pytests branch from 2c5be0a to 3527c29 Compare September 16, 2025 13:04

phracek added the READY-to-MERGE label Oct 2, 2025

phracek force-pushed the container_pytests branch from 07a1127 to 8b2045c Compare October 7, 2025 08:30

github-actions bot removed the pr/failing-ci label Oct 7, 2025

github-actions bot added the pr/failing-ci label Oct 7, 2025

phracek force-pushed the container_pytests branch from 32327e8 to 005d295 Compare October 7, 2025 09:55

github-actions bot added pr/failing-ci and removed pr/failing-ci labels Oct 7, 2025

phracek added the ready for review label Oct 13, 2025

phracek added 2 commits October 14, 2025 11:30

Rename OpenShift PyTest from test_nginx_* to test_ocp_*

ab047d5

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

Add container PyTest suite to nginx-container.

1223c90

All PyTest have naming `test_container_*.py` Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

phracek force-pushed the container_pytests branch from 005d295 to 1223c90 Compare October 14, 2025 10:13

github-actions bot removed the pr/failing-ci label Oct 14, 2025

github-actions bot added the pr/failing-ci label Oct 14, 2025

Add documentation to each tests.

7b672c4

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

github-actions bot removed the pr/failing-ci label Oct 15, 2025

github-actions bot added the pr/failing-ci label Oct 15, 2025

Add TAG to VARS so we should not imported separatelly

b68222a

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

phracek requested a review from frenzymadness October 17, 2025 07:19

frenzymadness approved these changes Oct 17, 2025

View reviewed changes

phracek merged commit 30885ea into master Oct 17, 2025
27 checks passed

phracek deleted the container_pytests branch October 17, 2025 07:31

phracek added a commit that referenced this pull request Oct 17, 2025

Fix issues that were suggested in pull request

c88e18a

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

phracek mentioned this pull request Oct 17, 2025

Fix issues that were suggested in pull request #351

Merged

phracek added a commit that referenced this pull request Oct 17, 2025

Fix issues that were suggested in pull request

175014e

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

phracek added a commit that referenced this pull request Oct 20, 2025

Fix issues that were suggested in pull request

20ce4a2

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

	pytest.skip("Run the chosen tests (not for micro variant which lacks perl)")
	pytest.skip("Micro image variant lacks Perl.")

	self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR / ".." / "..")
	self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR.parent.parent)


		THISDIR=$(dirname ${BASH_SOURCE[0]})

		git show -s

Conversation

phracek commented Sep 11, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

phracek commented Sep 11, 2025

Uh oh!

github-actions bot commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request validation

Failed

Uh oh!

github-actions bot commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing Farm results

Uh oh!

phracek commented Sep 16, 2025

Uh oh!

phracek commented Sep 16, 2025

Uh oh!

phracek commented Sep 16, 2025

Uh oh!

phracek commented Sep 19, 2025

Uh oh!

phracek commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

phracek commented Oct 7, 2025

Uh oh!

phracek commented Oct 7, 2025

Uh oh!

phracek commented Oct 8, 2025

Uh oh!

phracek commented Oct 14, 2025

Uh oh!

phracek commented Oct 15, 2025

Uh oh!

phracek commented Oct 15, 2025

Uh oh!

phracek commented Oct 16, 2025

Uh oh!

frenzymadness left a comment

Choose a reason for hiding this comment

Uh oh!

frenzymadness Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

frenzymadness Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

frenzymadness Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

frenzymadness Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

frenzymadness Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

frenzymadness Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

phracek commented Sep 11, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Sep 11, 2025 •

edited

Loading

github-actions bot commented Sep 11, 2025 •

edited

Loading

phracek commented Oct 7, 2025 •

edited

Loading