diff --git a/run.py b/run.py index ad8f30570..ea25cbe00 100755 --- a/run.py +++ b/run.py @@ -339,12 +339,20 @@ def check_requires(requires, suricata_config: SuricataConfig, test_dir=None): raise UnsatisfiedRequirementError( "requires at least version {}".format(min_version)) elif key == "lt-version": + if "gt-version" in requires: + if not Version().is_lt(parse_suricata_version(requires["gt-version"]), parse_suricata_version(requires["lt-version"])): + raise ImpossibleRequirementError( + "test has both lt-version {} and gt-version {}".format(requires["lt-version"], requires["gt-version"])) lt_version = requires["lt-version"] if not is_version_compatible(version=lt_version, suri_version=suri_version, expr="lt"): raise UnsatisfiedRequirementError( "for version less than {}".format(lt_version)) elif key == "gt-version": + if "lt-version" in requires: + if not Version().is_lt(parse_suricata_version(requires["gt-version"]), parse_suricata_version(requires["lt-version"])): + raise ImpossibleRequirementError( + "test has both lt-version {} and gt-version {}".format(requires["lt-version"], requires["gt-version"])) gt_version = requires["gt-version"] if not is_version_compatible(version=gt_version, suri_version=suri_version, expr="gt"): diff --git a/tests/alert-max/alert-max-append-higher-priority-drop-5180-01/test.yaml b/tests/alert-max/alert-max-append-higher-priority-drop-5180-01/test.yaml index fca1e5794..baba4e26d 100644 --- a/tests/alert-max/alert-max-append-higher-priority-drop-5180-01/test.yaml +++ b/tests/alert-max/alert-max-append-higher-priority-drop-5180-01/test.yaml @@ -9,9 +9,6 @@ pcap: ../alert-max-append-higher-priority/input.pcap checks: # Sub-test 1 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -21,9 +18,6 @@ checks: verdict.action: drop # Sub-test 2 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -84,9 +78,6 @@ checks: alert.signature_id: 5 # Sub-test 8 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: drop diff --git a/tests/alert-max/alert-max-append-higher-priority-drop-5180-02/test.yaml b/tests/alert-max/alert-max-append-higher-priority-drop-5180-02/test.yaml index 5dd50fc63..d6c7416cb 100644 --- a/tests/alert-max/alert-max-append-higher-priority-drop-5180-02/test.yaml +++ b/tests/alert-max/alert-max-append-higher-priority-drop-5180-02/test.yaml @@ -7,18 +7,12 @@ args: checks: # Subtest 1 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 0 match: event_type: alert alert.signature_id: 1 # Subtest 2 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -28,9 +22,6 @@ checks: verdict.action: drop # Subtest 3 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -41,18 +32,12 @@ checks: # Subtest 4 # Matches, but not enough space in packet alert queue - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 0 match: event_type: alert alert.signature_id: 4 # Subtest 5 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -63,18 +48,12 @@ checks: # Subtest 6 # Matches, but not enough space in packet alert queue - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 0 match: event_type: alert alert.signature_id: 6 # Subtest 7 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: drop @@ -82,9 +61,6 @@ checks: drop.reason: rules # Subtest 8 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: drop @@ -92,18 +68,12 @@ checks: drop.reason: "flow drop" # Subtest 9 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: flow flow.action: "drop" # Subtest 10 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: stats diff --git a/tests/alert-max/alert-max-append-higher-priority-drop-5180-03/test.yaml b/tests/alert-max/alert-max-append-higher-priority-drop-5180-03/test.yaml index 3e57e7c4e..c71bd2ccd 100644 --- a/tests/alert-max/alert-max-append-higher-priority-drop-5180-03/test.yaml +++ b/tests/alert-max/alert-max-append-higher-priority-drop-5180-03/test.yaml @@ -7,9 +7,6 @@ args: checks: # Sub-test 1 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -18,9 +15,6 @@ checks: verdict.action: drop # Sub-test 2 - filter: - requires: - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: alert @@ -57,8 +51,6 @@ checks: - filter: requires: min-version: 8.0.4 - lt-version: 8.0.4 - gt-version: 8.0.4 count: 1 match: event_type: drop