From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Thu, 19 Oct 2017 20:32:26 +0000 (+0300)
Subject: tests: Skip new ap_ciphers tests cleanly for missing mac80211 debugfs
X-Git-Tag: hostap_2_7~981
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9dc89968d3790f125b9c3ca5d9431d654738cf9;p=thirdparty%2Fhostap.git

tests: Skip new ap_ciphers tests cleanly for missing mac80211 debugfs

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

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):