From: Jouni Malinen <j@w1.fi>
Date: Sun, 11 Dec 2016 16:41:04 +0000 (+0200)
Subject: tests: Make scan_trigger_failure more informative
X-Git-Tag: hostap_2_7~2040
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15aa804285df8c42fcf5361db8da6e7e4b153996;p=thirdparty%2Fhostap.git

tests: Make scan_trigger_failure more informative

If wpa_state is left to SCANNING by a previously executed test case,
scan_trigger_failure will fail. Instead of waiting for that failure,
check for wpa_state at the beginning of the test case and report a more
helpful error message if the test case would fail due to a previously
executed test case.

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

diff --git a/tests/hwsim/test_scan.py b/tests/hwsim/test_scan.py
index 761520aba..9e823c378 100644
--- a/tests/hwsim/test_scan.py
+++ b/tests/hwsim/test_scan.py
@@ -817,6 +817,9 @@ def _test_scan_random_mac_connected(dev, apdev, params):
 @remote_compatible
 def test_scan_trigger_failure(dev, apdev):
     """Scan trigger to the driver failing"""
+    if dev[0].get_status_field('wpa_state') == "SCANNING":
+        raise Exception("wpa_state was already SCANNING")
+
     hostapd.add_ap(apdev[0], { "ssid": "test-scan" })
     bssid = apdev[0]['bssid']