From: Jouni Malinen <j@w1.fi>
Date: Mon, 24 Dec 2018 18:31:47 +0000 (+0200)
Subject: tests: Do not override connectivity test address if no driver info
X-Git-Tag: hostap_2_8~718
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7b141906b8524427912672788c40049c63fa7a8;p=thirdparty%2Fhostap.git

tests: Do not override connectivity test address if no driver info

Not all driver interfaces provide driver status information with the
local address, so skip the override step if the field is not available.
This is needed, e.g., with macsec_linux.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/tests/hwsim/hwsim_utils.py b/tests/hwsim/hwsim_utils.py
index 7a82df6e8..06d59c4f6 100644
--- a/tests/hwsim/hwsim_utils.py
+++ b/tests/hwsim/hwsim_utils.py
@@ -16,11 +16,15 @@ def run_connectivity_test(dev1, dev2, tos, dev1group=False, dev2group=False,
                           multicast_to_unicast=False, broadcast=True):
     addr1 = dev1.own_addr()
     if not dev1group and isinstance(dev1, WpaSupplicant):
-        addr1 = dev1.get_driver_status_field('addr')
+        addr = dev1.get_driver_status_field('addr')
+        if addr:
+            addr1 = addr
 
     addr2 = dev2.own_addr()
     if not dev2group and isinstance(dev2, WpaSupplicant):
-        addr2 = dev2.get_driver_status_field('addr')
+        addr = dev2.get_driver_status_field('addr')
+        if addr:
+            addr2 = addr
 
     dev1.dump_monitor()
     dev2.dump_monitor()