From 88c227d90a6b7b388c5c85d72802a0ca8f05ed5c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 13 Jan 2022 22:30:39 +0100 Subject: New upstream version 1.34.0 --- tools/test-networkmanager-service.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'tools/test-networkmanager-service.py') diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 66af0ede..f990a0e4 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -1489,10 +1489,6 @@ class ActiveConnection(ExportedObj): def start_deactivation(self): assert self._deactivation_id is None - self._set_state( - NM.ActiveConnectionState.DEACTIVATING, - NM.ActiveConnectionStateReason.USER_DISCONNECTED, - ) self.device.set_state( NM.DeviceState.DEACTIVATING, NM.DeviceStateReason.USER_REQUESTED ) @@ -1566,8 +1562,8 @@ class NetworkManager(ExportedObj): pass def set_state(self, new_state): - self._dbus_property_set(IFACE_NM, PRP_NM_STATE, state) - self.StateChanged(dbus.UInt32(self.state)) + self._dbus_property_set(IFACE_NM, PRP_NM_STATE, new_state) + self.StateChanged(dbus.UInt32(new_state)) @dbus.service.method(dbus_interface=IFACE_NM, in_signature="", out_signature="ao") def GetDevices(self): @@ -2270,7 +2266,7 @@ class IP4Config(ExportedObj): def __init__(self, generate_seed=_DEFAULT_ARG): ExportedObj.__init__(self, ExportedObj.create_path(IP4Config)) - if generate_seed == _DEFAULT_ARG: + if generate_seed is _DEFAULT_ARG: generate_seed = self.path props = self._props_generate(generate_seed) @@ -2469,7 +2465,7 @@ class IP6Config(ExportedObj): def __init__(self, generate_seed=_DEFAULT_ARG): ExportedObj.__init__(self, ExportedObj.create_path(IP6Config)) - if generate_seed == _DEFAULT_ARG: + if generate_seed is _DEFAULT_ARG: generate_seed = self.path props = self._props_generate(generate_seed) @@ -2643,7 +2639,7 @@ class Dhcp4Config(ExportedObj): def __init__(self, generate_seed=_DEFAULT_ARG): ExportedObj.__init__(self, ExportedObj.create_path(Dhcp4Config)) - if generate_seed == _DEFAULT_ARG: + if generate_seed is _DEFAULT_ARG: generate_seed = self.path props = self._props_generate(generate_seed) @@ -2684,7 +2680,7 @@ class Dhcp6Config(ExportedObj): def __init__(self, generate_seed=_DEFAULT_ARG): ExportedObj.__init__(self, ExportedObj.create_path(Dhcp6Config)) - if generate_seed == _DEFAULT_ARG: + if generate_seed is _DEFAULT_ARG: generate_seed = self.path props = self._props_generate(generate_seed) -- cgit 1.3.0-6-gf8a5