Merge pull request #19990 from mrc0mmand/test-tweaks

A couple of stability-related test tweaks

shell-completion/bash/bootctl

@@ -69,7 +69,7 @@ _bootctl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/busctl

@@ -140,7 +140,7 @@ _busctl() {
 
     n=$(($COMP_CWORD - $i))
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/coredumpctl

@@ -83,7 +83,7 @@ _coredumpctl() {
             fi
         done
 
-        if [[ -z $verb ]]; then
+        if [[ -z ${verb-} ]]; then
             comps=${VERBS[*]}
         elif __contains_word "$verb" ${VERBS[LIST]} ${VERBS[DUMP]}; then
             comps=''

shell-completion/bash/homectl

@@ -170,7 +170,7 @@ _homectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[NAME]}; then
         comps=$(__get_homes)

shell-completion/bash/hostnamectl

@@ -39,7 +39,7 @@ _hostnamectl() {
         [ARG]='-H --host -M --machine --json'
     )
 
-    if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
+    if __contains_word "$prev" ${OPTS[ARG]}; then
         case $prev in
             --host|-H)
                 comps=$(compgen -A hostname)
@@ -77,7 +77,7 @@ _hostnamectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[CHASSIS]}; then
         comps='desktop laptop convertible server tablet handset watch embedded vm container'

shell-completion/bash/localectl

@@ -67,7 +67,7 @@ _localectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[VARIANTS]}; then
         comps=$(command localectl list-x11-keymap-layouts)

shell-completion/bash/loginctl

@@ -93,7 +93,7 @@ _loginctl () {
         fi
     done
 
-    if   [[ -z $verb ]]; then
+    if   [[ -z ${verb-} ]]; then
         comps="${VERBS[*]}"
 
     elif __contains_word "$verb" ${VERBS[SESSIONS]}; then

shell-completion/bash/machinectl

@@ -95,7 +95,7 @@ _machinectl() {
         return 0
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
 
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then

shell-completion/bash/networkctl

@@ -69,7 +69,7 @@ _networkctl() {
         return 0
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/portablectl

@@ -79,7 +79,7 @@ _portablectl() {
 
     n=$(($COMP_CWORD - $i))
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/resolvectl

@@ -87,7 +87,7 @@ _resolvectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps="${VERBS[*]}"
 
     elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[DOMAIN]}; then

shell-completion/bash/systemctl.in

@@ -254,7 +254,7 @@ _systemctl () {
         cur_orig="$(printf '%q' $cur)"
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps="${VERBS[*]}"
 
     elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then

shell-completion/bash/systemd-analyze

@@ -93,12 +93,12 @@ _systemd_analyze() {
         return 0
     fi
 
-    if [[ -z $verb  && $cur = -* ]]; then
+    if [[ -z ${verb-}  && $cur = -* ]]; then
         COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
         return 0
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
 
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then

shell-completion/bash/systemd-delta

@@ -48,12 +48,12 @@ _systemd-delta() {
         return 0
     fi
 
-    if [[ "$cur" = -* ]]; then
+    if [[ "$cur" = -* ]] || [[ -z ${comps-} ]]; then
         COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
         return 0
     fi
 
-    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    COMPREPLY=( $(compgen -W '${comps-}' -- "$cur") )
     return 0
 }
 

shell-completion/bash/systemd-id128

@@ -61,7 +61,7 @@ _systemd_id128() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/systemd-resolve

@@ -71,7 +71,7 @@ _systemd-resolve() {
         return 0
     fi
 
-    if [[ "$cur" = -* ]]; then
+    if [[ "$cur" = -* ]] || [[ -z ${comps-} ]]; then
         COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
         return 0
     fi

shell-completion/bash/timedatectl

@@ -76,7 +76,7 @@ _timedatectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[BOOLEAN]}; then
         comps='true false'

shell-completion/bash/udevadm

@@ -73,7 +73,7 @@ _udevadm() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         if [[ "$cur" = -* ]]; then
             COMPREPLY=( $(compgen -W '${OPTS[COMMON]} ${OPTS[DEBUG]}' -- "$cur") )
         else

test/TEST-01-BASIC/test.sh

@@ -9,6 +9,18 @@ TEST_REQUIRE_INSTALL_TESTS=0
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
+# Explicitly override the default test_create_image() function to avoid the
+# call to mask_supporting_services(), since we want to run them in TEST-01-BASIC
+test_create_image() {
+    create_empty_image_rootdir
+
+    # Create what will eventually be our root filesystem onto an overlay
+    (
+        LOG_LEVEL=5
+        setup_basic_environment
+    )
+}
+
 test_append_files() {
     # install tests manually so the test is functional even when -Dinstall-tests=false
     local dst="${1:?}/usr/lib/systemd/tests/testdata/units/"

test/test-functions

@@ -2416,13 +2416,7 @@ test_create_image() {
     (
         LOG_LEVEL=5
         setup_basic_environment
-
+        mask_supporting_services
-        # We want to test all services in TEST-01-BASIC, but mask them in
-        # all other tests
-        if [[ "$TESTID" != "01" ]]; then
-            dinfo "Masking supporting services"
-            mask_supporting_services
-        fi
     )
 }
 

test/units/testsuite-38.sh

@@ -82,11 +82,18 @@ check_freezer_state() {
     name="${1%.$suffix}"
     object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
 
-    state=$(busctl get-property \
+    for _ in {0..10}; do
-                   org.freedesktop.systemd1 \
+        state=$(busctl get-property \
-                   "${object_path}" \
+                       org.freedesktop.systemd1 \
-                   org.freedesktop.systemd1.Unit \
+                       "${object_path}" \
-                   FreezerState | cut -d " " -f2 | tr -d '"')
+                       org.freedesktop.systemd1.Unit \
+                       FreezerState | cut -d " " -f2 | tr -d '"')
+
+        # Ignore the intermediate freezing & thawing states in case we check
+        # the unit state too quickly
+        [[ "$state" =~ ^(freezing|thawing)$ ]] || break
+        sleep .5
+    done
 
     [ "$state" = "$2" ] || {
         echo "error: unexpected freezer state, expected: $2, actual: $state" >&2