yolo: drop test for 'private' install on bookworm ...

This commit is contained in:
Alexandre Aubin 2023-11-23 21:10:16 +01:00
parent bea9c77046
commit fee310b0b2
3 changed files with 8 additions and 3 deletions

View file

@ -123,7 +123,11 @@ parse_check_process() {
is_test_enabled setup_root && add_test "TEST_INSTALL" "root" is_test_enabled setup_root && add_test "TEST_INSTALL" "root"
is_test_enabled setup_sub_dir && add_test "TEST_INSTALL" "subdir" is_test_enabled setup_sub_dir && add_test "TEST_INSTALL" "subdir"
is_test_enabled setup_nourl && add_test "TEST_INSTALL" "nourl" is_test_enabled setup_nourl && add_test "TEST_INSTALL" "nourl"
if [[ $DIST == "bullseye" ]]
then
# Testing private vs. public install doesnt make that much sense, remote it for bookworm etc...
is_test_enabled setup_private && add_test "TEST_INSTALL" "private" is_test_enabled setup_private && add_test "TEST_INSTALL" "private"
fi
is_test_enabled multi_instance && add_test "TEST_INSTALL" "multi" is_test_enabled multi_instance && add_test "TEST_INSTALL" "multi"
is_test_enabled backup_restore && add_test "TEST_BACKUP_RESTORE" is_test_enabled backup_restore && add_test "TEST_BACKUP_RESTORE"

View file

@ -37,7 +37,8 @@ def generate_test_list_base(test_manifest, default_install_args, is_webapp, is_m
else: else:
yield test_suite_id, "install.nourl", default_meta yield test_suite_id, "install.nourl", default_meta
if is_webapp and ("is_public" in install_args or "init_main_permission" in install_args): if os.environ.get("DIST") == "bullseye" and is_webapp and ("is_public" in install_args or "init_main_permission" in install_args):
# Testing private vs. public install doesnt make that much sense, remote it for bookworm etc...
yield test_suite_id, "install.private", default_meta yield test_suite_id, "install.private", default_meta
if is_multi_instance: if is_multi_instance:

View file

@ -37,7 +37,7 @@ run_all_tests() {
tests_toml="$package_path/tests.toml" tests_toml="$package_path/tests.toml"
if [ -e "$tests_toml" ] if [ -e "$tests_toml" ]
then then
python3 "./lib/parse_tests_toml.py" "$package_path" "$TEST_CONTEXT/tests" DIST=$DIST python3 "./lib/parse_tests_toml.py" "$package_path" "$TEST_CONTEXT/tests"
else else
# Parse the check_process only if it's exist # Parse the check_process only if it's exist
check_process="$package_path/check_process" check_process="$package_path/check_process"