From c9dc89968d3790f125b9c3ca5d9431d654738cf9 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 19 Oct 2017 23:32:26 +0300 Subject: [PATCH] tests: Skip new ap_ciphers tests cleanly for missing mac80211 debugfs Signed-off-by: Jouni Malinen --- tests/hwsim/test_ap_ciphers.py | 42 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/tests/hwsim/test_ap_ciphers.py b/tests/hwsim/test_ap_ciphers.py index 9ea9fcf1e..3f67962fd 100644 --- a/tests/hwsim/test_ap_ciphers.py +++ b/tests/hwsim/test_ap_ciphers.py @@ -347,28 +347,34 @@ def test_ap_cipher_bip_req_mismatch(dev, apdev): def get_rx_spec(phy, gtk=False): keys = "/sys/kernel/debug/ieee80211/%s/keys" % (phy) - for key in os.listdir(keys): - keydir = keys + "/" + key - files = os.listdir(keydir) - if not gtk and "station" not in files: - continue - if gtk and "station" in files: - continue - with open(keydir + "/rx_spec") as f: - return f.read() + try: + for key in os.listdir(keys): + keydir = keys + "/" + key + files = os.listdir(keydir) + if not gtk and "station" not in files: + continue + if gtk and "station" in files: + continue + with open(keydir + "/rx_spec") as f: + return f.read() + except OSError, e: + raise HwsimSkip("debugfs not supported in mac80211") return None def get_tk_replay_counter(phy, gtk=False): keys = "/sys/kernel/debug/ieee80211/%s/keys" % (phy) - for key in os.listdir(keys): - keydir = keys + "/" + key - files = os.listdir(keydir) - if not gtk and "station" not in files: - continue - if gtk and "station" in files: - continue - with open(keydir + "/replays") as f: - return int(f.read()) + try: + for key in os.listdir(keys): + keydir = keys + "/" + key + files = os.listdir(keydir) + if not gtk and "station" not in files: + continue + if gtk and "station" in files: + continue + with open(keydir + "/replays") as f: + return int(f.read()) + except OSError, e: + raise HwsimSkip("debugfs not supported in mac80211") return None def test_ap_cipher_replay_protection_ap_ccmp(dev, apdev):