auto-t: turn off scan address randomization in testHotspot

This (hopefully) will make this test pass better on slower machines.
In addition the mechanism of copying over separate main.conf files
was changed (rather than echo'ing the option into /tmp/main.conf)

autotests/testHotspot/anqp_delay_test.py

@@ -5,8 +5,8 @@ import sys
 import os
 
 sys.path.append('../util')
-import iwd
 from iwd import IWD
+from iwd import IWD_CONFIG_DIR
 from iwd import PSKAgent
 from iwd import NetworkType
 from hostapd import HostapdCLI
@@ -87,8 +87,7 @@ class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_hotspot('example.conf')
-        conf = '[General]\nDisableANQP=0\n'
+        IWD.copy_to_storage('anqp_enabled.conf', storage_dir=IWD_CONFIG_DIR, name='main.conf')
-        os.system('echo "%s" > /tmp/main.conf' % conf)
 
     @classmethod
     def tearDownClass(cls):

autotests/testHotspot/anqp_disabled.conf

@@ -0,0 +1,5 @@
+[General]
+DisableANQP=1
+
+[Scan]
+DisableMacAddressRandomization=true

autotests/testHotspot/anqp_enabled.conf

@@ -0,0 +1,5 @@
+[General]
+DisableANQP=0
+
+[Scan]
+DisableMacAddressRandomization=true

autotests/testHotspot/autoconnect_test.py

@@ -5,8 +5,8 @@ import sys
 import os
 
 sys.path.append('../util')
-import iwd
 from iwd import IWD
+from iwd import IWD_CONFIG_DIR
 from iwd import NetworkType
 from hostapd import HostapdCLI
 import testutil
@@ -109,8 +109,7 @@ class Test(unittest.TestCase):
     def setUpClass(cls):
         IWD.copy_to_hotspot('autoconnect.conf')
         IWD.copy_to_storage('ssidWPA2-1.psk')
-        conf = '[General]\nDisableANQP=0\n'
+        IWD.copy_to_storage('anqp_enabled.conf', storage_dir=IWD_CONFIG_DIR, name='main.conf')
-        os.system('echo "%s" > /tmp/main.conf' % conf)
 
     @classmethod
     def tearDownClass(cls):

autotests/testHotspot/hessid_test.py

@@ -5,8 +5,8 @@ import sys
 import os
 
 sys.path.append('../util')
-import iwd
 from iwd import IWD
+from iwd import IWD_CONFIG_DIR
 from iwd import PSKAgent
 from iwd import NetworkType
 from hostapd import HostapdCLI
@@ -50,8 +50,7 @@ class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_hotspot('hessid.conf')
-        conf = '[General]\nDisableANQP=1\n'
+        IWD.copy_to_storage('anqp_disabled.conf', storage_dir=IWD_CONFIG_DIR, name='main.conf')
-        os.system('echo "%s" > /tmp/main.conf' % conf)
 
     @classmethod
     def tearDownClass(cls):

autotests/testHotspot/hotspot_test.py

@@ -5,8 +5,8 @@ import sys
 import os
 
 sys.path.append('../util')
-import iwd
 from iwd import IWD
+from iwd import IWD_CONFIG_DIR
 from iwd import PSKAgent
 from iwd import NetworkType
 from hostapd import HostapdCLI
@@ -50,8 +50,7 @@ class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_hotspot('example.conf')
-        conf = '[General]\nDisableANQP=0\n'
+        IWD.copy_to_storage('anqp_enabled.conf', storage_dir=IWD_CONFIG_DIR, name='main.conf')
-        os.system('echo "%s" > /tmp/main.conf' % conf)
 
     @classmethod
     def tearDownClass(cls):

autotests/testHotspot/roaming_test.py

@@ -5,8 +5,8 @@ import sys
 import os
 
 sys.path.append('../util')
-import iwd
 from iwd import IWD
+from iwd import IWD_CONFIG_DIR
 from iwd import PSKAgent
 from iwd import NetworkType
 from hostapd import HostapdCLI
@@ -50,8 +50,7 @@ class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_hotspot('roaming.conf')
-        conf = '[General]\nDisableANQP=1\n'
+        IWD.copy_to_storage('anqp_disabled.conf', storage_dir=IWD_CONFIG_DIR, name='main.conf')
-        os.system('echo "%s" > /tmp/main.conf' % conf)
 
     @classmethod
     def tearDownClass(cls):