GetIfaceIdList returns a list of int (not str).
The output of wlanGetIfaceIdList is incorrectly typed, which causes
runtime validation of the type to fail breaking some tests (e.g.
WlanWirelessNetworkManagementTest). This change corrects the relevant
type annotations, and the relevant validator argument.
Change-Id: I94ac77b2ea865f3ef582b554b02bdd11a2a69fad
Reviewed-on: https://fuchsia-review.googlesource.com/c/antlion/+/1043993
Reviewed-by: Sam Balana <sbalana@google.com>
Commit-Queue: Karl Ward <karlward@google.com>
diff --git a/packages/antlion/controllers/fuchsia_lib/wlan_lib.py b/packages/antlion/controllers/fuchsia_lib/wlan_lib.py
index f82fa71..5714c43 100644
--- a/packages/antlion/controllers/fuchsia_lib/wlan_lib.py
+++ b/packages/antlion/controllers/fuchsia_lib/wlan_lib.py
@@ -161,7 +161,7 @@
return self.send_command(test_cmd, test_args)
- def wlanGetIfaceIdList(self) -> dict[str, Any]:
+ def wlanGetIfaceIdList(self) -> dict[int, Any]:
"""Get a list if wlan interface IDs.
Returns:
diff --git a/packages/antlion/test_utils/abstract_devices/wlan_device.py b/packages/antlion/test_utils/abstract_devices/wlan_device.py
index b840464..7be00c7 100644
--- a/packages/antlion/test_utils/abstract_devices/wlan_device.py
+++ b/packages/antlion/test_utils/abstract_devices/wlan_device.py
@@ -454,13 +454,13 @@
additional_ping_params=additional_ping_params,
)
- def get_wlan_interface_id_list(self) -> list[str]:
+ def get_wlan_interface_id_list(self) -> list[int]:
response = self.device.sl4f.wlan_lib.wlanGetIfaceIdList()
if response.get("error"):
raise ConnectionError(
f'Failed to get wlan interface IDs: {response["error"]}'
)
- return MapValidator(response).list("result").all(str)
+ return MapValidator(response).list("result").all(int)
def get_default_wlan_test_interface(self) -> str:
if self.device.wlan_client_test_interface_name is None:
