summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Martinsons <frederic.martinsons@sigfox.com>2021-01-28 09:29:41 +0100
committerThomas Haller <thaller@redhat.com>2021-02-02 10:42:33 +0100
commit38331fc02c1b5c24625d118c1c93e6b544d59d57 (patch)
tree28638e6eb06f71b54ebcc8e90be1db290b66890d
parent5a7df5deee1e474d243ffe3dcc359997979c5e54 (diff)
downloadNetworkManager-38331fc02c1b5c24625d118c1c93e6b544d59d57.tar.gz
tests: add a dbus test function to change delay of active connection state change
Signed-off-by: Frederic Martinsons <frederic.martinsons@sigfox.com> https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/740
-rwxr-xr-xtools/test-networkmanager-service.py19
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
index 6d85a02dae..fe5e4d44d6 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -1424,6 +1424,7 @@ class ActiveConnection(ExportedObj):
self._activation_id = None
self._deactivation_id = None
+ self.activation_state_change_delay_ms = 50
s_con = con_inst.con_hash[NM.SETTING_CONNECTION_SETTING_NAME]
@@ -1495,7 +1496,9 @@ class ActiveConnection(ExportedObj):
def _activation_step1(self):
assert self._activation_id is not None
- self._activation_id = GLib.timeout_add(50, self._activation_step2)
+ self._activation_id = GLib.timeout_add(
+ self.activation_state_change_delay_ms, self._activation_step2
+ )
self.device.set_active_connection(self)
self.device.set_state(NM.DeviceState.PREPARE, NM.DeviceStateReason.NONE)
self._set_state(
@@ -1521,7 +1524,9 @@ class ActiveConnection(ExportedObj):
def start_activation(self):
assert self._activation_id is None
- self._activation_id = GLib.timeout_add(50, self._activation_step1)
+ self._activation_id = GLib.timeout_add(
+ self.activation_state_change_delay_ms, self._activation_step1
+ )
def start_deactivation(self):
assert self._deactivation_id is None
@@ -1964,6 +1969,16 @@ class NetworkManager(ExportedObj):
def SetActiveConnectionFailure(self, connection_id, failure):
gl.force_activation_failure[connection_id] = failure
+ @dbus.service.method(dbus_interface=IFACE_TEST, in_signature="ou", out_signature="")
+ def SetActiveConnectionStateChangedDelay(self, devpath, delay_ms):
+ for ac in reversed(self.active_connections):
+ if ac.device.path == devpath:
+ ac.activation_state_change_delay_ms = delay_ms
+ return
+ raise BusErr.UnknownDeviceException(
+ "Device with iface '%s' not found" % devpath
+ )
+
@dbus.service.method(
dbus_interface=IFACE_TEST, in_signature="ouu", out_signature=""
)