diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /tools/test-networkmanager-service.py | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'tools/test-networkmanager-service.py')
| -rwxr-xr-x | tools/test-networkmanager-service.py | 16 |
1 files changed, 6 insertions, 10 deletions
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) |