From a20dc659ec68a55ab86bb180316d1ec6d6a1fffc Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Tue, 7 Jul 2020 11:09:11 +0200
Subject: * debian/tests:   - don't use the old service name in the test, the
 compatibility alias     has been removed

---
 debian/changelog                     | 8 ++++++++
 debian/tests/killswitches-no-urfkill | 2 +-
 debian/tests/nm.py                   | 2 +-
 debian/tests/urfkill-integration     | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 4a6517e8..4c08c603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-manager (1.25.91-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/tests:
+    - don't use the old service name in the test, the compatibility alias
+      has been removed
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 07 Jul 2020 11:06:20 +0200
+
 network-manager (1.25.91-1ubuntu1) groovy; urgency=medium
 
   * Resynchronize on Debian, remaining changes:
diff --git a/debian/tests/killswitches-no-urfkill b/debian/tests/killswitches-no-urfkill
index f7adc67c..4736ffba 100755
--- a/debian/tests/killswitches-no-urfkill
+++ b/debian/tests/killswitches-no-urfkill
@@ -20,7 +20,7 @@ insmod debian/tests/fake-rfkill.ko
 
 fake_id=$(rfkill list | grep fake | awk -F: '{ print $1; }')
 
-service network-manager start
+service NetworkManager start
 sleep 30
 
 # test blocking the device
diff --git a/debian/tests/nm.py b/debian/tests/nm.py
index 7399c4d9..f4fe46d6 100755
--- a/debian/tests/nm.py
+++ b/debian/tests/nm.py
@@ -857,7 +857,7 @@ def setUpModule():
     assert libc6.unshare(ctypes.c_int(0x00020000)) == 0, 'failed to unshare mount namespace'
 
     # stop system-wide NetworkManager to avoid interfering with tests
-    nm_running = subprocess.call('service network-manager stop 2>&1', shell=True) == 0
+    nm_running = subprocess.call('service NetworkManager stop 2>&1', shell=True) == 0
 
 
 def tearDownModule():
diff --git a/debian/tests/urfkill-integration b/debian/tests/urfkill-integration
index 11499db9..61c4096a 100644
--- a/debian/tests/urfkill-integration
+++ b/debian/tests/urfkill-integration
@@ -31,11 +31,11 @@ service urfkill stop || true
 echo "+++ unblocking device $fake_id"
 rfkill unblock $fake_id
 echo "+++ stopping network-manager"
-service network-manager stop || true
+service NetworkManager stop || true
 echo "+++ blocking device $fake_id"
 rfkill block $fake_id
 echo "+++ starting network-manager"
-service network-manager start
+service NetworkManager start
 
 echo "+++ Waiting for the devices to settle"
 sleep 30
-- 
cgit 1.3.0-6-gf8a5