Skip to content

Remove help test #57

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
Mar 16, 2026
Merged

Remove help test #57

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
8dbe4ea
Add the latest container-common-scripts
phracek Mar 16, 2026
0a1854f
Let's remove doc test as help.1 is not generated at all
phracek Mar 16, 2026
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
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 5 files
+6 −6 .github/workflows/container-tests.yml
+1 −6 common.mk
+0 −1,185 test-lib-openshift.sh
+0 −138 test-lib-remote-openshift.sh
+0 −77 test-openshift.yaml
6 changes: 0 additions & 6 deletions test/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ run_tests_no_pass
run_tests_no_pass_altuid
run_tests_no_root_altuid
run_change_password_test
run_doc_test
run_bind_address_test
run_no_bind_address_test
"
Expand Down Expand Up @@ -217,11 +216,6 @@ test_scl_usage() {
fi
}

run_doc_test() {
ct_doc_content_old 6379 "VALKEY.*PASSWORD" volume
return $?
}

function run_tests() {
local name=$1 ; shift
local ret
Expand Down
12 changes: 4 additions & 8 deletions test/test_container_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ def test_run_app_test(self, password, test_name):
assert self.s2i_app.create_container(
cid_file_name=test_name, container_args=container_arg
)
cid = self.s2i_app.get_cid(cid_file_name=test_name)
assert cid
cip = self.s2i_app.get_cip(cid_file_name=test_name)
assert cip
cip, cid = self.s2i_app.get_cip_cid(cid_file_name=test_name)
assert cip and cid
testing_password = f"-a {password}" if password else ""
valkey_cmd = f"valkey-cli -h {cip} {testing_password}"
# Test with valkey-cli returns 'PONG' from the different container
Expand Down Expand Up @@ -101,10 +99,8 @@ def test_bind_address(self, bind_address):
cid_file_name=cid_file_name,
container_args=f"--user=100001 -e VALKEY_PASSWORD=pass {bind_address}",
)
cid = self.s2i_app.get_cid(cid_file_name=cid_file_name)
assert cid
cip = self.s2i_app.get_cip(cid_file_name=cid_file_name)
assert cip
cip, cid = self.s2i_app.get_cip_cid(cid_file_name=cid_file_name)
assert cip and cid
assert (
PodmanCLIWrapper.podman_exec_shell_command(
cid_file_name=cid, cmd="test -f ${VALKEY_CONF}", return_output=False
Expand Down
10 changes: 4 additions & 6 deletions test/test_container_basics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ def test_run_change_password(self):
cid_file_name=cid_file_name,
container_args=f"-e VALKEY_PASSWORD=foo -v {data_dir}/data:/var/lib/valkey/data:Z",
)
cid1 = self.app.get_cid(cid_file_name=cid_file_name)
cip1 = self.app.get_cip(cid_file_name=cid_file_name)
assert cip1
cip1, cid1 = self.app.get_cip_cid(cid_file_name=cid_file_name)
assert cip1 and cid1
# The valkey-cli command should response with 'PONG'
valkey_output = PodmanCLIWrapper.podman_run_command_and_remove(
cid_file_name=VARS.IMAGE_NAME,
Expand All @@ -74,9 +73,8 @@ def test_run_change_password(self):
cid_file_name=cid_file_name,
container_args=f"-e VALKEY_PASSWORD=bar -v {data_dir}/data:/var/lib/valkey/data:Z",
)
cid2 = self.app.get_cid(cid_file_name=cid_file_name)
cip2 = self.app.get_cip(cid_file_name=cid_file_name)
assert cip2
cip2, cid2 = self.app.get_cip_cid(cid_file_name=cid_file_name)
assert cip2 and cid2
# The valkey-cli command should responds with 'PONG'
valkey_output = PodmanCLIWrapper.podman_run_command_and_remove(
cid_file_name=VARS.IMAGE_NAME, cmd=f"valkey-cli -h {cip2} -a bar ping"
Expand Down
Loading