From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Date: Wed, 3 Apr 2019 15:17:18 +0000 (+0300)
Subject: tests: Update regulatory for FI to allow new regdb rules
X-Git-Tag: hostap_2_9~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab3b7c5c72dd9fc035b467d60b6d03c1d3d88a0;p=thirdparty%2Fhostap.git

tests: Update regulatory for FI to allow new regdb rules

Recent regdb enabled UNII 3 in Finland. Change the
mbo_supp_oper_classes_fi test accordingly to accept either the previous
or the current value to be reported.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
---

diff --git a/tests/hwsim/test_mbo.py b/tests/hwsim/test_mbo.py
index 1f0e9c1ad..693ddf587 100644
--- a/tests/hwsim/test_mbo.py
+++ b/tests/hwsim/test_mbo.py
@@ -141,9 +141,14 @@ def run_mbo_supp_oper_class(dev, apdev, country, expected, inc5,
     # For now, allow operating classes 121-123 to be missing since not all
     # installed regdb files include the related US DFS channels.
     expected2 = expected2.replace('78797a7b7c', '787c')
-    if res2 != expected and res2 != expected2:
+    expected3 = expected
+    # For now, allow operating classes 124-127 to be missing for Finland
+    # since they were added only recently in regdb.
+    if country == "FI":
+        expected3 = expected3.replace("7b7c7d7e7f80", "7b80")
+    if res2 != expected and res2 != expected2 and res2 != expected3:
         raise Exception("Unexpected supp_op_class string (country=%s, 2.4 GHz): %s (expected: %s)" % (country, res2, expected))
-    if inc5 and res5 != expected and res5 != expected2:
+    if inc5 and res5 != expected and res5 != expected2 and res5 != expected3:
         raise Exception("Unexpected supp_op_class string (country=%s, 5 GHz): %s (expected: %s)" % (country, res5, expected))
 
 def test_mbo_supp_oper_classes_za(dev, apdev):
@@ -154,7 +159,7 @@ def test_mbo_supp_oper_classes_za(dev, apdev):
 def test_mbo_supp_oper_classes_fi(dev, apdev):
     """MBO and supported operating classes (FI)"""
     run_mbo_supp_oper_class(dev, apdev, "FI",
-                            "515354737475767778797a7b808182", True)
+                            "515354737475767778797a7b7c7d7e7f808182", True)
 
 def test_mbo_supp_oper_classes_us(dev, apdev):
     """MBO and supported operating classes (US)"""