From f8fedb0ec86dd38d9a6d18025f850e2fb0c4af16 Mon Sep 17 00:00:00 2001
From: Tim Kourt <tim.a.kourt@linux.intel.com>
Date: Tue, 15 Jan 2019 19:14:58 -0800
Subject: [PATCH] auto-t: Disable MAC rand. for tests with hidden networks

---
 autotests/testHiddenNetworks/hw.conf       | 1 +
 autotests/testHiddenNetworks/main.conf     | 6 ++++++
 autotests/testHiddenNetworks/validation.py | 2 +-
 autotests/testScan/hw.conf                 | 2 +-
 autotests/testScan/main.conf               | 6 ++++++
 autotests/testScan/periodic_scan_test.py   | 2 +-
 autotests/testScan/requested_scan_test.py  | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 autotests/testHiddenNetworks/main.conf
 create mode 100644 autotests/testScan/main.conf

diff --git a/autotests/testHiddenNetworks/hw.conf b/autotests/testHiddenNetworks/hw.conf
index dafbdfc4..edd061a8 100644
--- a/autotests/testHiddenNetworks/hw.conf
+++ b/autotests/testHiddenNetworks/hw.conf
@@ -2,6 +2,7 @@
 num_radios=6
 start_iwd=0
 max_test_exec_interval_sec=160
+tmpfs_extra_stuff=main.conf
 
 [HOSTAPD]
 rad0=ssidHiddenOpen.conf
diff --git a/autotests/testHiddenNetworks/main.conf b/autotests/testHiddenNetworks/main.conf
new file mode 100644
index 00000000..f6ffddfe
--- /dev/null
+++ b/autotests/testHiddenNetworks/main.conf
@@ -0,0 +1,6 @@
+[Scan]
+#
+# Discovery of the hidden networks with randomization flag set works with real
+# hardware, but fails when used in simulated environment with mac80211_hwsim.
+# Disable MAC randomization for the tests with hidden networks.
+disable_mac_address_randomization=true
diff --git a/autotests/testHiddenNetworks/validation.py b/autotests/testHiddenNetworks/validation.py
index face81f0..035c7d09 100644
--- a/autotests/testHiddenNetworks/validation.py
+++ b/autotests/testHiddenNetworks/validation.py
@@ -71,7 +71,7 @@ class TestConnectAutoconnect(unittest.TestCase):
 
     def validate(self, ssid, autoconnect, throws = None, use_agent = False,
                                                     wait_periodic_scan = False):
-        wd = IWD(True)
+        wd = IWD(True, '/tmp')
 
         try:
             self.validate_connection(wd, ssid, autoconnect, throws, use_agent,
diff --git a/autotests/testScan/hw.conf b/autotests/testScan/hw.conf
index 8172765b..82875f0b 100644
--- a/autotests/testScan/hw.conf
+++ b/autotests/testScan/hw.conf
@@ -2,7 +2,7 @@
 num_radios=5
 start_iwd=0
 max_test_exec_interval_sec=60
-tmpfs_extra_stuff=../misc/certs:../misc/secrets
+tmpfs_extra_stuff=../misc/certs:../misc/secrets:main.conf
 
 [HOSTAPD]
 rad0=ssid_hidden.conf
diff --git a/autotests/testScan/main.conf b/autotests/testScan/main.conf
new file mode 100644
index 00000000..f6ffddfe
--- /dev/null
+++ b/autotests/testScan/main.conf
@@ -0,0 +1,6 @@
+[Scan]
+#
+# Discovery of the hidden networks with randomization flag set works with real
+# hardware, but fails when used in simulated environment with mac80211_hwsim.
+# Disable MAC randomization for the tests with hidden networks.
+disable_mac_address_randomization=true
diff --git a/autotests/testScan/periodic_scan_test.py b/autotests/testScan/periodic_scan_test.py
index e35ebd5a..2bca624e 100644
--- a/autotests/testScan/periodic_scan_test.py
+++ b/autotests/testScan/periodic_scan_test.py
@@ -52,7 +52,7 @@ class Test(unittest.TestCase):
             self.set_network(network.name)
 
     def test_scan(self):
-        wd = IWD(True)
+        wd = IWD(True, '/tmp')
 
         try:
             self.validate_scan(wd)
diff --git a/autotests/testScan/requested_scan_test.py b/autotests/testScan/requested_scan_test.py
index 47b58d22..7ab7f61a 100644
--- a/autotests/testScan/requested_scan_test.py
+++ b/autotests/testScan/requested_scan_test.py
@@ -53,7 +53,7 @@ class Test(unittest.TestCase):
             self.set_network(network.name)
 
     def test_scan(self):
-        wd = IWD(True)
+        wd = IWD(True, '/tmp')
 
         try:
             self.validate_scan(wd)