From e384b156dc17d43fd627c934e2112e3f3e85d641 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 16 Oct 2018 18:21:07 +0300 Subject: [PATCH] tests: Update tshark wlan_mgmt compatibility code for new version It looks like at least tshark 2.6.3 uses a different error message for unknown display filter fields: tshark: Neither "wlan_mgt.fixed.category_code" nor "4" are field or protocol names. and a different status exit code (2 instead of 1). Add a new handler for this combination to allow automatic wlan_mgt to wlan conversion to happen. Signed-off-by: Jouni Malinen --- tests/hwsim/tshark.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/hwsim/tshark.py b/tests/hwsim/tshark.py index 2d4389c69..c3b8f36d4 100644 --- a/tests/hwsim/tshark.py +++ b/tests/hwsim/tshark.py @@ -70,6 +70,17 @@ def _run_tshark(filename, filter, display=None, wait=True): stderr=open('/dev/null', 'w')) out = cmd.communicate()[0] cmd.wait() + if res == 2: + if "tshark: Neither" in output[1] and "are field or protocol names" in output[1]: + errors = output[1].split('\n') + fields = [] + for f in errors: + if f.startswith("tshark: Neither "): + f = f.split(' ')[2].strip('"') + if f: + fields.append(f) + continue + raise UnknownFieldsException(fields) return out