From 67b410ae364d0d54779c0c674c6cd51d08d1f4ce Mon Sep 17 00:00:00 2001 From: Seyeong Kim Date: Mon, 20 Apr 2020 15:40:44 -0700 Subject: Import patches-unapplied version 1.22.10-1ubuntu2 to ubuntu/focal-proposed Imported using git-ubuntu import. Changelog parent: 251005dec19cfe8337b887edf04e7134632e1872 New changelog entries: * d/t/killswitches-no-urfkill - Call udevadm settle before nmcli radio wifi To make sure that change is updated. (LP: #1733321) --- debian/tests/killswitches-no-urfkill | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'debian/tests') diff --git a/debian/tests/killswitches-no-urfkill b/debian/tests/killswitches-no-urfkill index d6ef3a38..f7adc67c 100755 --- a/debian/tests/killswitches-no-urfkill +++ b/debian/tests/killswitches-no-urfkill @@ -31,13 +31,18 @@ if ! rfkill list $fake_id | grep 'Soft' | awk '{ print $3; }' | grep -qc yes; th exit 1 fi +# The systemd-rfkill service starts up whenever rfkill changes state, so on a +# 1-cpu system that might delay the event change from reaching nm before the +# check below, causing this test to fail. The settle added here delays the +# nmcli check until after the rfkill uevent has definitely been processed. +udevadm settle + if ! LC_MESSAGES=C nmcli radio wifi | grep -qc disabled; then echo "ERROR: NM could not track device state." rmmod fake-rfkill || true exit 1 fi - # test unblocking the device rfkill unblock $fake_id if ! rfkill list $fake_id | grep 'Soft' | awk '{ print $3; }' | grep -qc no; then @@ -46,6 +51,10 @@ if ! rfkill list $fake_id | grep 'Soft' | awk '{ print $3; }' | grep -qc no; the exit 1 fi +# same reason as above, however since systemd-rfkill stays running for 30 secs or so +# it's unlikely that it would start up again here, but it's still safer to call settle +udevadm settle + if ! LC_MESSAGES=C nmcli radio wifi | grep -qc enabled; then echo "ERROR: NM could not track device state to enabled." rmmod fake-rfkill || true -- cgit 1.3.0-6-gf8a5