From: Jouni Malinen <j@w1.fi>
Date: Fri, 4 Dec 2020 09:43:45 +0000 (+0200)
Subject: tests: Skip test cases properly if tshark is not available
X-Git-Tag: hostap_2_10~736
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dcfdd5e47a1bef0746f1ad95270887753e1bb58;p=thirdparty%2Fhostap.git

tests: Skip test cases properly if tshark is not available

Instead of trying to process empty results, mark the test case as
skipped if tshark is not available.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/tests/hwsim/tshark.py b/tests/hwsim/tshark.py
index d6a57f0a3..32cdf4701 100644
--- a/tests/hwsim/tshark.py
+++ b/tests/hwsim/tshark.py
@@ -12,6 +12,8 @@ import subprocess
 import logging
 logger = logging.getLogger()
 
+from utils import *
+
 class UnknownFieldsException(Exception):
     def __init__(self, fields):
         Exception.__init__(self, "unknown tshark fields %s" % ','.join(fields))
@@ -41,6 +43,8 @@ def _run_tshark(filename, filter, display=None, wait=True):
                                stderr=subprocess.PIPE)
     except Exception as e:
         logger.info("Could run run tshark check: " + str(e))
+        if "No such file or directory: 'tshark'" in str(e):
+            raise HwsimSkip("No tshark available")
         cmd = None
         return None
 
@@ -111,6 +115,8 @@ def run_tshark_json(filename, filter):
                                stderr=subprocess.PIPE)
     except Exception as e:
         logger.info("Could run run tshark: " + str(e))
+        if "No such file or directory: 'tshark'" in str(e):
+            raise HwsimSkip("No tshark available")
         return None
     output = cmd.communicate()
     out = output[0].decode()