From 19bb93a622b1e307c5c2306ce373f2e923093ddb Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Tue, 23 Apr 2019 11:18:26 -0700 Subject: [PATCH] auto-t: require "needs_hwsim" on hwsim tests Running autotests with native hardware will not work on tests which depend on the hwsim python API (since hwsim will not be running). For these tests, it will now be required that they specify: needs_hwsim=1 This allows the test to be skipped when running with native hardware rather than the test failing with a python exception. --- autotests/testAPRoam/hw.conf | 1 + autotests/testFT-8021x-roam/hw.conf | 2 ++ autotests/testFT-PSK-roam/hw.conf | 1 + autotests/testFT-SAE-roam/hw.conf | 1 + autotests/testPreauth-roam/hw.conf | 1 + autotests/testRSSIAgent/hw.conf | 1 + autotests/testSAQuery-spoofing/hw.conf | 1 + 7 files changed, 8 insertions(+) diff --git a/autotests/testAPRoam/hw.conf b/autotests/testAPRoam/hw.conf index 00a31063..ab89c096 100644 --- a/autotests/testAPRoam/hw.conf +++ b/autotests/testAPRoam/hw.conf @@ -1,5 +1,6 @@ [SETUP] num_radios=4 +needs_hwsim=1 [HOSTAPD] rad0=ssid1.conf diff --git a/autotests/testFT-8021x-roam/hw.conf b/autotests/testFT-8021x-roam/hw.conf index e6be0f1c..d3c039ae 100644 --- a/autotests/testFT-8021x-roam/hw.conf +++ b/autotests/testFT-8021x-roam/hw.conf @@ -3,6 +3,8 @@ num_radios=3 max_test_exec_interval_sec=45 tmpfs_extra_stuff=../misc/certs:main.conf iwd_config_dir=/tmp +tmpfs_extra_stuff=../misc/certs +needs_hwsim=1 [HOSTAPD] rad0=ft-eap-ccmp-1.conf diff --git a/autotests/testFT-PSK-roam/hw.conf b/autotests/testFT-PSK-roam/hw.conf index 0e72f16c..e020b54f 100644 --- a/autotests/testFT-PSK-roam/hw.conf +++ b/autotests/testFT-PSK-roam/hw.conf @@ -3,6 +3,7 @@ num_radios=3 max_test_exec_interval_sec=45 iwd_config_dir=/tmp tmpfs_extra_stuff=main.conf +needs_hwsim=1 [HOSTAPD] rad0=ft-psk-ccmp-1.conf diff --git a/autotests/testFT-SAE-roam/hw.conf b/autotests/testFT-SAE-roam/hw.conf index 1ff1934f..a0ff7b16 100644 --- a/autotests/testFT-SAE-roam/hw.conf +++ b/autotests/testFT-SAE-roam/hw.conf @@ -3,6 +3,7 @@ num_radios=4 max_test_exec_interval_sec=120 iwd_config_dir=/tmp tmpfs_extra_stuff=main.conf +needs_hwsim=1 [HOSTAPD] rad0=ft-sae-1.conf diff --git a/autotests/testPreauth-roam/hw.conf b/autotests/testPreauth-roam/hw.conf index eba07167..0070712c 100644 --- a/autotests/testPreauth-roam/hw.conf +++ b/autotests/testPreauth-roam/hw.conf @@ -2,6 +2,7 @@ num_radios=3 max_test_exec_interval_sec=30 tmpfs_extra_stuff=../misc/certs +needs_hwsim=1 [HOSTAPD] rad0=eaptls-preauth-1.conf diff --git a/autotests/testRSSIAgent/hw.conf b/autotests/testRSSIAgent/hw.conf index 7a6ba278..094e9378 100644 --- a/autotests/testRSSIAgent/hw.conf +++ b/autotests/testRSSIAgent/hw.conf @@ -3,6 +3,7 @@ num_radios=2 max_test_exec_interval_sec=60 iwd_config_dir=/tmp tmpfs_extra_stuff=main.conf +needs_hwsim=1 [HOSTAPD] rad0=open.conf diff --git a/autotests/testSAQuery-spoofing/hw.conf b/autotests/testSAQuery-spoofing/hw.conf index fad15b88..ba63798c 100644 --- a/autotests/testSAQuery-spoofing/hw.conf +++ b/autotests/testSAQuery-spoofing/hw.conf @@ -1,5 +1,6 @@ [SETUP] num_radios=2 +needs_hwsim=1 [HOSTAPD] rad0=ssidCCMP.conf