From dfe107070a97e8cf943ccf4f88e7f1c3718de4d6 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 19 Dec 2018 12:30:09 +0000 Subject: debian/tests/nm.py: Make assert_iface_down() not check the interface's state We call nmclient.deactivate_connection() to terminate connections that the testsuite sets up, and according to upstream this is not guaranteed to do anything in particular to the link state. It seems that dnsmasq 2.80 somehow alters the previous assumption that it would be 'state DOWN', so the implementation detail we were checking previously no longer holds. The testsuite does still check that the IPs are removed from the interface, which is logically what we want anyway. (LP: #1805857) --- debian/changelog | 13 +++++++++++++ debian/tests/nm.py | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1c20ec7d..a1f7533f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +network-manager (1.12.6-0ubuntu3) UNRELEASED; urgency=medium + + * debian/tests/nm.py: Make assert_iface_down() not check the interface's + state. We call nmclient.deactivate_connection() to terminate connections + that the testsuite sets up, and according to upstream this is not + guaranteed to do anything in particular to the link state. It seems that + dnsmasq 2.80 somehow alters the previous assumption that it would be + 'state DOWN', so the implementation detail we were checking previously no + longer holds. The testsuite does still check that the IPs are removed from + the interface, which is logically what we want anyway. (LP: #1805857) + + -- Iain Lane Wed, 19 Dec 2018 12:23:29 +0000 + network-manager (1.12.6-0ubuntu2) disco; urgency=medium [ Robie Basak ] diff --git a/debian/tests/nm.py b/debian/tests/nm.py index 64350e08..ead66f5a 100755 --- a/debian/tests/nm.py +++ b/debian/tests/nm.py @@ -192,7 +192,6 @@ class NetworkManagerTest(network_test_base.NetworkTestBase): out = subprocess.check_output(['ip', 'a', 'show', 'dev', iface], universal_newlines=True) - self.assertIn('state DOWN', out) self.assertNotIn('inet 192', out) self.assertNotIn('inet6 2600', out) -- cgit 1.3.0-6-gf8a5