tests: Skip some test cases when MCC is enabled

Some tests assume that only a single channel is used. Skip,
such tests/checks when MCC is enabled.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2015-07-27 22:24:32 +03:00 committed by Jouni Malinen
parent 85e152b646
commit 1977de368b
2 changed files with 5 additions and 1 deletions

View file

@ -20,6 +20,7 @@ from test_p2p_persistent import invite_from_cli
from test_p2p_persistent import invite_from_go from test_p2p_persistent import invite_from_go
from test_p2p_persistent import invite from test_p2p_persistent import invite
from test_ap_ht import clear_scan_cache from test_ap_ht import clear_scan_cache
from utils import HwsimSkip
def test_concurrent_autogo(dev, apdev): def test_concurrent_autogo(dev, apdev):
"""Concurrent P2P autonomous GO""" """Concurrent P2P autonomous GO"""
@ -265,6 +266,9 @@ def test_concurrent_persistent_group(dev, apdev):
def test_concurrent_invitation_channel_mismatch(dev, apdev): def test_concurrent_invitation_channel_mismatch(dev, apdev):
"""P2P persistent group invitation and channel mismatch""" """P2P persistent group invitation and channel mismatch"""
if dev[0].get_mcc() > 1:
raise HwsimSkip("Skip due to MCC being enabled")
form(dev[0], dev[1]) form(dev[0], dev[1])
dev[0].dump_monitor() dev[0].dump_monitor()
dev[1].dump_monitor() dev[1].dump_monitor()

View file

@ -894,7 +894,7 @@ def test_p2p_msg_invitation_req_to_go(dev, apdev):
raise Exception("Not a P2P Public Action frame " + str(dialog_token)) raise Exception("Not a P2P Public Action frame " + str(dialog_token))
if p2p['subtype'] != P2P_INVITATION_RESP: if p2p['subtype'] != P2P_INVITATION_RESP:
raise Exception("Unexpected subtype %d" % p2p['subtype']) raise Exception("Unexpected subtype %d" % p2p['subtype'])
if p2p['p2p_status'] != 7: if p2p['p2p_status'] != 7 and dev[1].get_mcc() <= 1:
raise Exception("Unexpected status %d" % p2p['p2p_status']) raise Exception("Unexpected status %d" % p2p['p2p_status'])
def test_p2p_msg_invitation_req_unknown(dev, apdev): def test_p2p_msg_invitation_req_unknown(dev, apdev):