From 03125c9ddc7df678efba0c8ab8f3bb54e3d11571 Mon Sep 17 00:00:00 2001 From: Andrei Otcheretianski Date: Wed, 23 Dec 2020 12:17:10 +0200 Subject: [PATCH] tests: Fix ap_ft_eap_pull_wildcard_multi_bss Python enumerates dictionaries in an arbitrary order, thus the resulting configuration file will have the parameters shuffled randomly. This may cause the test to fail when, for example, auth_server_addr is placed after auth_server_port. Fix this by enforcing some of the fields to be placed before the others. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_ap_ft.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py index 1099d3bd2..12d4c1395 100644 --- a/tests/hwsim/test_ap_ft.py +++ b/tests/hwsim/test_ap_ft.py @@ -1606,7 +1606,14 @@ def test_ap_ft_eap_pull_wildcard_multi_bss(dev, apdev, params): f.write("interface=%s\n" % ifname2) f.write("bssid=%s\n" % bssid2) f.write("ctrl_interface=/var/run/hostapd\n") + + fields = ["ssid", "wpa_passphrase", "nas_identifier", "wpa_key_mgmt", + "wpa", "rsn_pairwise", "auth_server_addr"] + for name in fields: + f.write("%s=%s\n" % (name, params[name])) for name, val in params.items(): + if name in fields: + continue f.write("%s=%s\n" % (name, val)) hapd2 = hostapd.add_bss(apdev[0], ifname2, bssconf)