Merge pull request #23771 from mrc0mmand/test-tweaks

A couple of test-output-related tweaks
2022-06-18 10:45:22 +09:00
parent 25ed7633b1 8cda7b91ff
commit 297cc64bfb
20 changed files with 29 additions and 46 deletions
@@ -49,6 +49,7 @@ function report_result() {
    systemd-cat cat "/$name.log"
 }

+set +x
 # Associative array for running tasks, where running[test-path]=PID
 declare -A running=()
 for task in "${TEST_LIST[@]}"; do
@@ -60,7 +61,7 @@ for task in "${TEST_LIST[@]}"; do
                # Task has finished, report its result and drop it from the queue
                wait "${running[$key]}" && ec=0 || ec=$?
                report_result "$key" $ec
-                unset running["$key"]
+                unset "running[$key]"
                # Break from inner for loop and outer while loop to skip
                # the sleep below when we find a free slot in the queue
                break 2
@@ -72,6 +73,7 @@ for task in "${TEST_LIST[@]}"; do
    done

    if [[ -x $task ]]; then
+        echo "Executing test '$task'"
        log_file="/${task##*/}.log"
        $task &>"$log_file" &
        running[$task]=$!
@@ -80,11 +82,14 @@ done

 # Wait for remaining running tasks
 for key in "${!running[@]}"; do
+    echo "Waiting for test '$key' to finish"
    wait ${running[$key]} && ec=0 || ec=$?
    report_result "$key" $ec
-    unset running["$key"]
+    unset "running[$key]"
 done

+set -x
+
 # Test logs are sometimes lost, as the system shuts down immediately after
 journalctl --sync

@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$

@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 # Create a binary for which execve() will fail
 touch /tmp/brokenbinary
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 systemd-run --wait --unit=test27-one \
            -p StandardOutput=file:/tmp/stdout \
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 systemctl disable --now systemd-timesyncd.service

@@ -11,7 +11,6 @@ set -o pipefail

 if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; then
    systemd-analyze log-level debug
-    systemd-analyze log-target console

    # Run a service that is guaranteed to be the first candidate for OOM killing
    systemd-run --unit=oomtest.service \
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 function test_directory() {
    local directory="$1"
@@ -5,7 +5,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 unit=testsuite-38-sleep.service

@@ -18,7 +17,7 @@ dbus_freeze() {
    local name object_path suffix

    suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"

    busctl call \
@@ -32,7 +31,7 @@ dbus_thaw() {
    local name object_path suffix

    suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"

    busctl call \
@@ -66,7 +65,7 @@ dbus_can_freeze() {
    local name object_path suffix

    suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"

    busctl get-property \
@@ -80,7 +79,7 @@ check_freezer_state() {
    local name object_path suffix

    suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"

    for _ in {0..10}; do
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 export SYSTEMD_PAGER=
 SERVICE_PATH="$(mktemp /etc/systemd/system/execreloadXXX.service)"
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 declare -A property

@@ -7,7 +7,6 @@ set -o pipefail
 MAX_SECS=60

 systemd-analyze log-level debug
-systemd-analyze log-target console

 # test one: Restart=on-failure should restart the service
 systemd-run --unit=one -p Type=oneshot -p Restart=on-failure /bin/bash -c "exit 1" \
@@ -34,7 +34,6 @@ wait_for_state() {
 }

 systemd-analyze log-level debug
-systemd-analyze log-target console
 systemctl service-log-level systemd-homed debug

 # Create a tmpfs to use as backing store for the home dir. That way we can enforce a size limit nicely.
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 systemctl start testsuite-47-repro
 sleep 4
@@ -4,7 +4,6 @@ set -ex
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 systemctl enable test-honor-first-shutdown.service
 systemctl start test-honor-first-shutdown.service
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail

 systemd-analyze log-level debug
-systemd-analyze log-target console

 # Loose checks to ensure the environment has the necessary features for systemd-oomd
 [[ -e /proc/pressure ]] || echo "no PSI" >>/skipped
@@ -28,7 +28,6 @@ wait_on_state_or_fail () {
 }

 systemd-analyze log-level debug
-systemd-analyze log-target console


 cat >/run/systemd/system/testservice-fail-59.service <<EOF
@@ -5,7 +5,6 @@ set -o pipefail

 setup() {
    systemd-analyze log-level debug
-    systemd-analyze log-target console

    for i in {0..3};
    do
@@ -6,7 +6,6 @@ set -o pipefail
 RESULTS_FILE=/tmp/testsuite66serviceresults

 systemd-analyze log-level debug
-systemd-analyze log-target console

 systemctl start testsuite-66-deviceisolation.service