container/postgresql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #415 from phracek/fix_typo_run_openshift

Browse source 
Fix typo in OpenShift 3 tests
This commit is contained in:
phracek 2021-08-11 13:50:51 +00:00
commit abffd4737c
11 changed files with 279 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/run_test
View file

@ -29,7 +29,6 @@ run_s2i_enable_ssl_test
run_upgrade_test
run_migration_test
run_pgaudit_test
run_latest_imagestreams_test
"
test $# -eq 1 -a "${1-}" == --list && echo "$TEST_LIST" && exit 0
@ -655,7 +654,7 @@ run_upgrade_test ()
# is fixed for non-SCL use cases
{ [ "${OS}" == "fedora" ] || [ "${OS}" == "rhel8" ]; } && return 0
local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 none" prev= act=
local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 13 none" prev= act=
for act in $upgrade_path; do
if test "$act" = $VERSION; then
break
@ -677,9 +676,9 @@ run_migration_test ()
local from_version
# Only test a subset of the migration path on non-intel hosts
if [ "$(uname -i)" == "x86_64" ]; then
local upgrade_path="9.2 9.4 9.5 9.6 10 12"
local upgrade_path="9.2 9.4 9.5 9.6 10 12 13"
else
local upgrade_path="10 12"
local upgrade_path="10 12 13"
fi
for from_version in $upgrade_path; do
@ -899,17 +898,6 @@ EOSQL"
grep -E 'AUDIT: SESSION,.*,.*,READ,SELECT,,,SELECT' "${data_dir}"/userdata/log/postgresql-*.log
}
function run_latest_imagestreams_test() {
local result=1
# Switch to root directory of a container
echo "Testing the latest version in imagestreams"
pushd "${test_dir}/.." >/dev/null || return 1
ct_check_latest_imagestreams
result=$?
popd >/dev/null || return 1
return $result
}
function run_all_tests() {
for test_case in $TEST_LIST; do
: "Running test $test_case"