tests: Fix ap_ft_r0_key_expiration test

The test configures ft_r0_key_lifetime parameter, however ft_params
already contain the r0_key_lifetime. Since both options are accepted by
hostapd and set the same field, one of them gets overwritten.
As the dictionary enumeration order is not guaranteed in python, the
test may sporadically fail.
Fix that by explicitely removing the unneeded parameter.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py
index 12d4c1395ede83315edfea0cdf974328868d976b..1598c89a67a498d4ece8a4bc4834c239653fa8bd 100644 (file)
--- a/tests/hwsim/test_ap_ft.py
+++ b/tests/hwsim/test_ap_ft.py
@@ -3352,9 +3352,11 @@ def test_ap_ft_r0_key_expiration(dev, apdev):
     passphrase = "12345678"
 
     params = ft_params1(ssid=ssid, passphrase=passphrase)
+    params.pop('r0_key_lifetime', None)
     params['ft_r0_key_lifetime'] = "2"
     hapd0 = hostapd.add_ap(apdev[0], params)
     params = ft_params2(ssid=ssid, passphrase=passphrase)
+    params.pop('r0_key_lifetime', None)
     params['ft_r0_key_lifetime'] = "2"
     hapd1 = hostapd.add_ap(apdev[1], params)