diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/tests/urfkill-integration | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 8d821451..a5137f92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.10.4-1ubuntu2) UNRELEASED; urgency=medium + + * debian/tests/urfkill-integration - don't stop/start network manager + + -- Bryan Quigley <bryan.quigley@canonical.com> Fri, 23 Feb 2018 13:52:48 -0500 + network-manager (1.10.4-1ubuntu1) bionic; urgency=medium * Merge with Debian (LP: #1734586). Remaining changes: diff --git a/debian/tests/urfkill-integration b/debian/tests/urfkill-integration index 32c009f9..09e194ed 100644 --- a/debian/tests/urfkill-integration +++ b/debian/tests/urfkill-integration @@ -42,17 +42,12 @@ echo echo echo "--- Testing killswitch bringup when URFKILL is running: follow URfkill signals" -echo "+++ stopping network-manager" -service network-manager stop echo "+++ starting urfkill" service urfkill start sleep 15 echo "+++ blocking device $fake_id" rfkill block $fake_id rfkill list -sleep 5 -echo "+++ starting network-manager" -service network-manager start echo "+++ Waiting for the devices to settle" sleep 30 |