From c64b454a2f81c53e644abb888e159943282c8d29 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 3 Oct 2016 11:35:42 +0300 Subject: [PATCH] tests: Fix wpas_ctrl_sched_scan_plans without WPA_TRACE This test case did not clear sched_scan_plans if alloc_fail() resulted in skipping the test case. This would result in the following autoscan_exponential and autoscan_periodic test cases failing. Signed-off-by: Jouni Malinen --- tests/hwsim/test_wpas_ctrl.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/test_wpas_ctrl.py b/tests/hwsim/test_wpas_ctrl.py index 96ed551be..76731e525 100644 --- a/tests/hwsim/test_wpas_ctrl.py +++ b/tests/hwsim/test_wpas_ctrl.py @@ -1913,12 +1913,14 @@ def test_wpas_ctrl_sched_scan_plans(dev, apdev): """wpa_supplicant sched_scan_plans parsing""" dev[0].request("SET sched_scan_plans foo") dev[0].request("SET sched_scan_plans 10:100 20:200 30") - with alloc_fail(dev[0], 1, "wpas_sched_scan_plans_set"): - dev[0].request("SET sched_scan_plans 10:100") dev[0].request("SET sched_scan_plans 4294967295:0") dev[0].request("SET sched_scan_plans 1 1") dev[0].request("SET sched_scan_plans ") - dev[0].request("SET sched_scan_plans ") + try: + with alloc_fail(dev[0], 1, "wpas_sched_scan_plans_set"): + dev[0].request("SET sched_scan_plans 10:100") + finally: + dev[0].request("SET sched_scan_plans ") def test_wpas_ctrl_signal_monitor(dev, apdev): """wpa_supplicant SIGNAL_MONITOR command"""