test: make TEST-35-LOGIN stable again

Let's add a couple of synchronization points and reduce the amount of
sleeps to make the test, hopefully, stable again.

Follow-up to 638c241.
Related: #2179309
rhel-only

Author: mrc0mmand

test/TEST-35-LOGIN/testsuite.sh

@@ -24,6 +24,8 @@ EOF
 
 teardown_idle_action_lock() {(
     set +ex
+    [[ -e dbus.log ]] && cat dbus.log
+    [[ -e logind.log ]] && cat logind.log
     rm -f /run/systemd/logind.conf.d/idle-action-lock.conf
     rm -f /run/systemd/systemd-logind.service.d/debug.conf
     pkill -9 -u "$(id -u testuser)"
@@ -37,56 +39,61 @@ test_lock_idle_action() {
         return 0
     fi
 
+    local busctl_pid expect_pid ts
+
     setup_idle_action_lock
     trap teardown_idle_action_lock RETURN
 
     if loginctl --no-legend | awk '{ print $3; }' | sort -u | grep -q testuser ; then
-        echo >&2 "Session of the \'testuser\' is already present."
+        echo >&2 "Session of the 'testuser' is already present."
         return 1
     fi
 
-    # IdleActionSec is set 1s but the accuracy of associated timer is 30s so we
+    rm -f /tmp/expect-sync
+
+    # IdleActionSec= is set 1s but the accuracy of associated timer is 30s so we
     # need to sleep in worst case for 31s to make sure timer elapsed. We sleep
-    # here for 35s to accomodate for any possible scheudling delays.
-    cat > /tmp/test.exp <<EOF
+    # here for 35s to accommodate for any possible scheduling delays.
+    cat >/tmp/test.exp <<EOF
 spawn systemd-run -G -t -p PAMName=login -p User=testuser bash
-send "sleep 35\r"
+expect "three times"
+send "touch /tmp/expect-sync\r"
+sleep 35
 send "echo foobar\r"
-send "sleep 35\r"
+sleep 35
 send "exit\r"
 interact
 wait
 EOF
 
     ts="$(date '+%H:%M:%S')"
-    busctl --match "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='Lock'" monitor  > dbus.log &
+    busctl --match "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='Lock'" monitor &>dbus.log &
+    busctl_pid=$!
+    timeout 15 bash -c 'while ! grep -q "Monitoring bus" dbus.log; do sleep .5; done'
 
-    expect /tmp/test.exp &
+    expect -d /tmp/test.exp &
+    expect_pid=$!
 
-    # Sleep a bit to give expect time to spawn systemd-run before we check for
+    # Wait a bit to give expect time to spawn systemd-run before we check for
     # the presence of resulting session.
-    sleep 2
-    if [ "$(loginctl --no-legend | awk '{ print $3; }' | sort -u | grep -c testuser)" != 1 ] ; then
-        echo >&2 "\'testuser\' is expected to have exactly one session running."
+    timeout 15 bash -c "while [[ ! -e /tmp/expect-sync ]]; do sleep .5; done"
+    if [[ "$(loginctl --no-legend | awk '{ print $3; }' | grep -c testuser)" -ne 1 ]] ; then
+        echo >&2 "'testuser' is expected to have exactly one session running."
         return 1
     fi
 
-    wait %2
-    sleep 20
-    kill %1
+    wait "$expect_pid"
 
     # We slept for 35s , in that interval all sessions should have become idle
     # and "Lock" signal should have been sent out. Then we wrote to tty to make
     # session active again and next we slept for another 35s so sessions have
     # become idle again. 'Lock' signal is sent out for each session, we have at
     # least one session, so minimum of 2 "Lock" signals must have been sent.
-    if [ "$(grep -c Member=Lock dbus.log)" -lt 2 ]; then
-        echo >&2 "Too few 'Lock' D-Bus signal sent, expected at least 2."
-        return 1
-    fi
+    timeout 30 bash -c 'while [[ $(grep -c Member=Lock dbus.log) -lt 2 ]]; do sleep .5; done'
+    kill "$busctl_pid"
 
-    journalctl -b -u systemd-logind.service --since="$ts" > logind.log
-    if [ "$(grep -c 'System idle. Doing lock operation.' logind.log)" -lt 2 ]; then
+    journalctl -b -u systemd-logind.service --since="$ts" >logind.log
+    if [[ "$(grep -c 'System idle. Doing lock operation.' logind.log)" -lt 2 ]]; then
         echo >&2 "System haven't entered idle state at least 2 times."
         return 1
     fi

test/test-functions

@@ -23,7 +23,7 @@ fi
 
 PATH_TO_INIT=$ROOTLIBDIR/systemd
 
-BASICTOOLS="test sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe sed cmp tee rm true false chmod chown ln xargs env mktemp mountpoint useradd userdel"
+BASICTOOLS="test sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe sed cmp tee rm true false chmod chown ln xargs env mktemp mountpoint useradd userdel timeout"
 DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname find"
 
 STATEDIR="${BUILD_DIR:-.}/test/$(basename $(dirname $(realpath $0)))"