summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-11-02 13:49:25 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2018-11-02 14:56:40 +0100
commit5ba301f4eb652a208a500a39d59dadf427a64590 (patch)
treed2655afd469942bec7550d84021103360e86e6a0
parent5665f67bae25ee9f96e057c2a993b8cf69cbc127 (diff)
downloadNetworkManager-bg/issue39.tar.gz
tests: simulate old LastScan wifi value in test-networkmanager-service.pybg/issue39
In this way clients will randomly find that the AP list is older than 30 seconds and they will issue a new scan.
-rwxr-xr-xtools/test-networkmanager-service.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
index 8a37fb17bb..9aa44a906e 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -916,16 +916,8 @@ class WifiDevice(Device):
self.aps = []
self.scan_cb_id = None
- # Note: we would like to simulate how nmcli calls RequestScan() and we could
- # do so by using an older timestamp. However, that makes the client tests
- # racy, because if a bunch of nmcli instances run in parallel against this
- # service, earlier instances will issue a RequestScan(), while later instances
- # won't do that (because the LastScan timestamp is already updated). That means,
- # the later instances will print the scan result immediately, and in another sort
- # order. That should be fixed, by nmcli not starting to print anything, before
- # all RequestScan() requests complete, and thus, always print a consistent list
- # of results.
- ts = NM.utils_get_timestamp_msec()
+ # Use a randomly older timestamp to trigger RequestScan() from the client
+ ts = max(0, NM.utils_get_timestamp_msec() - Util.random_int(self.path, 20000, 40000))
props = {
PRP_WIFI_HW_ADDRESS: mac,