If no networks are found, return None rather than an empty array. This is easier to check by the caller (and was assumed in some cases). Also add an exception to get_ordered_network if no network is found. --- autotests/util/iwd.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py index 3ba5112c..35e5a693 100755 --- a/autotests/util/iwd.py +++ b/autotests/util/iwd.py @@ -376,6 +376,10 @@ class Device(IWDDBusAbstract): for bus_obj in self._station.GetOrderedNetworks(): ordered_network = OrderedNetwork(bus_obj) ordered_networks.append(ordered_network) + + if len(ordered_networks) == 0: + return None + return ordered_networks def get_ordered_network(self, network): @@ -385,6 +389,9 @@ class Device(IWDDBusAbstract): ''' ordered_networks = self.get_ordered_networks() + if not ordered_networks: + raise Exception('Network %s not found' % network) + for n in ordered_networks: if n.name == network: return n -- 2.17.1