tests: Disable IPv6 in protected keep-alive test

When the new protected_keep_alive test was added, the @disable_ipv6
decorator was not moved. Disable IPv6 for both keep alive tests by
moving it to the run_ function.

Also remove the @remote_compatible decorator as it does not work with
IPv6 disablement. It was not removed in the patch to disable IPv6 in the
original test.

Fixes: fdf23679f823 ("tests: More coverage for WNM BSS max idle period management")
Fixes: 1bd5e35b8733 ("tests: Disable IPv6 in WNM keep-alive test")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>

diff --git a/tests/hwsim/test_wnm.py b/tests/hwsim/test_wnm.py
index cfe813e40b1b11b7bc042a60653defdd8fa1ff03..9d8a91382b763251dc9589f29b51401ca9b83f9d 100644 (file)
--- a/tests/hwsim/test_wnm.py
+++ b/tests/hwsim/test_wnm.py
@@ -786,8 +786,6 @@ def test_wnm_bss_tm_req(dev, apdev):
     resp = rx_bss_tm_resp(hapd, expect_dialog=8, expect_status=7)
     dev[0].dump_monitor()
 
-@remote_compatible
-@disable_ipv6
 def test_wnm_bss_keep_alive(dev, apdev):
     """WNM keep-alive"""
     run_wnm_bss_keep_alive(dev, apdev, False)
@@ -796,6 +794,7 @@ def test_wnm_bss_protected_keep_alive(dev, apdev):
     """WNM protected keep-alive"""
     run_wnm_bss_keep_alive(dev, apdev, True)
 
+@disable_ipv6
 def run_wnm_bss_keep_alive(dev, apdev, protected):
     hapd = start_wnm_ap(apdev[0], bss_transition=False, ap_max_inactivity=1,
                         bss_max_idle=2 if protected else 1, rsn=True)