From: Jason Ish <ish@unx.ca>
Date: Wed, 17 Jan 2018 12:49:48 +0000 (-0600)
Subject: runner: fix skip on no pcap (and no test.yaml)
X-Git-Tag: suricata-6.0.4~527
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef7fc03fc4a3c34255d8f5ceb9a0688f2e8e5f63;p=thirdparty%2Fsuricata-verify.git

runner: fix skip on no pcap (and no test.yaml)
---

diff --git a/run.py b/run.py
index 2c5476eaf..1b0fd3739 100755
--- a/run.py
+++ b/run.py
@@ -240,9 +240,10 @@ class TestRunner:
                             cwd=self.directory)
 
     def check_requires(self):
-        if not "requires" in self.config:
-            return
-        requires = self.config["requires"]
+        if "requires" in self.config:
+            requires = self.config["requires"]
+        else:
+            requires = {}
 
         if "min-version" in requires:
             min_version = parse_suricata_version(requires["min-version"])
@@ -287,7 +288,8 @@ class TestRunner:
             else:
                 pcap_required = True
             if pcap_required:
-                if not glob.glob(os.path.join(self.directory, "*.pcap")):
+                if not glob.glob(os.path.join(self.directory, "*.pcap")) + \
+                   glob.glob(os.path.join(self.directory, "*.pcapng")):
                     raise UnsatisfiedRequirementError("No pcap file found")
 
     def run(self):