diff --git a/lib/legacy.sh b/lib/legacy.sh index c13d063..e3ca680 100644 --- a/lib/legacy.sh +++ b/lib/legacy.sh @@ -123,7 +123,11 @@ parse_check_process() { 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_nourl && add_test "TEST_INSTALL" "nourl" - is_test_enabled setup_private && add_test "TEST_INSTALL" "private" + 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" + fi is_test_enabled multi_instance && add_test "TEST_INSTALL" "multi" is_test_enabled backup_restore && add_test "TEST_BACKUP_RESTORE" diff --git a/lib/parse_tests_toml.py b/lib/parse_tests_toml.py index 3713491..6ac69c1 100644 --- a/lib/parse_tests_toml.py +++ b/lib/parse_tests_toml.py @@ -37,7 +37,8 @@ def generate_test_list_base(test_manifest, default_install_args, is_webapp, is_m else: 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 if is_multi_instance: diff --git a/lib/tests_coordination.sh b/lib/tests_coordination.sh index 1cba268..5369b9e 100644 --- a/lib/tests_coordination.sh +++ b/lib/tests_coordination.sh @@ -37,7 +37,7 @@ run_all_tests() { tests_toml="$package_path/tests.toml" if [ -e "$tests_toml" ] 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 # Parse the check_process only if it's exist check_process="$package_path/check_process"