]> git.ipfire.org Git - thirdparty/suricata-verify.git/commitdiff
runner: fix skip on no pcap (and no test.yaml)
authorJason Ish <ish@unx.ca>
Wed, 17 Jan 2018 12:49:48 +0000 (06:49 -0600)
committerJason Ish <ish@unx.ca>
Wed, 17 Jan 2018 12:49:48 +0000 (06:49 -0600)
run.py

diff --git a/run.py b/run.py
index 2c5476eaf6cb48144fcd72c63f39135c565a8cb9..1b0fd3739a57b28e3532efa88ba29e382b752959 100755 (executable)
--- 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):