f6acf13f03
* Thu Oct 16 2025 Phil Sutter <psutter@redhat.com> [1.0.9-5.el9] - tests: py: missing json output in never merge across non-expression statements (Phil Sutter) [RHEL-114095] - tests: py: add missing json.output data (Phil Sutter) [RHEL-114095] - tests: py: remove huge-limit test cases (Phil Sutter) [RHEL-114095] - datatype: rt_symbol_table_init() to search for iproute2 configs (Phil Sutter) [RHEL-114095] - tests: shell: connect chains to hook point (Phil Sutter) [RHEL-114095] - tests: shell: Fix sets/reset_command_0 for current kernels (Phil Sutter) [RHEL-114095] Resolves: RHEL-114095
227 lines
6.0 KiB
Diff
227 lines
6.0 KiB
Diff
From a902fc33ebf202de6e8a7fa7cbd8ba840d80605c Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <psutter@redhat.com>
|
|
Date: Thu, 16 Oct 2025 16:12:50 +0200
|
|
Subject: [PATCH] tests: py: remove huge-limit test cases
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-114095
|
|
Upstream Status: nftables commit 1ee84db0360db0da336d5b1ee92807d29fcfbbe1
|
|
|
|
commit 1ee84db0360db0da336d5b1ee92807d29fcfbbe1
|
|
Author: Florian Westphal <fw@strlen.de>
|
|
Date: Thu Jan 18 13:24:04 2024 +0100
|
|
|
|
tests: py: remove huge-limit test cases
|
|
|
|
These tests will fail once the kernel checks for overflow
|
|
in the internal token bucken counter, so drop them.
|
|
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
tests/py/any/limit.t | 4 ---
|
|
tests/py/any/limit.t.json | 51 --------------------------------
|
|
tests/py/any/limit.t.json.output | 28 ------------------
|
|
tests/py/any/limit.t.payload | 17 -----------
|
|
4 files changed, 100 deletions(-)
|
|
|
|
diff --git a/tests/py/any/limit.t b/tests/py/any/limit.t
|
|
index a04ef42..2a84e3f 100644
|
|
--- a/tests/py/any/limit.t
|
|
+++ b/tests/py/any/limit.t
|
|
@@ -22,7 +22,6 @@ limit rate 2 kbytes/second;ok
|
|
limit rate 1025 kbytes/second;ok
|
|
limit rate 1023 mbytes/second;ok
|
|
limit rate 10230 mbytes/second;ok
|
|
-limit rate 1023000 mbytes/second;ok
|
|
limit rate 512 kbytes/second burst 5 packets;fail
|
|
|
|
limit rate 1 bytes / second;ok;limit rate 1 bytes/second
|
|
@@ -33,7 +32,6 @@ limit rate 1 gbytes / second;fail
|
|
limit rate 1025 bytes/second burst 512 bytes;ok
|
|
limit rate 1025 kbytes/second burst 1023 kbytes;ok
|
|
limit rate 1025 mbytes/second burst 1025 kbytes;ok
|
|
-limit rate 1025000 mbytes/second burst 1023 mbytes;ok
|
|
|
|
limit rate over 400/minute;ok;limit rate over 400/minute burst 5 packets
|
|
limit rate over 20/second;ok;limit rate over 20/second burst 5 packets
|
|
@@ -47,9 +45,7 @@ limit rate over 2 kbytes/second;ok
|
|
limit rate over 1025 kbytes/second;ok
|
|
limit rate over 1023 mbytes/second;ok
|
|
limit rate over 10230 mbytes/second;ok
|
|
-limit rate over 1023000 mbytes/second;ok
|
|
|
|
limit rate over 1025 bytes/second burst 512 bytes;ok
|
|
limit rate over 1025 kbytes/second burst 1023 kbytes;ok
|
|
limit rate over 1025 mbytes/second burst 1025 kbytes;ok
|
|
-limit rate over 1025000 mbytes/second burst 1023 mbytes;ok
|
|
diff --git a/tests/py/any/limit.t.json b/tests/py/any/limit.t.json
|
|
index e001ba0..73160b2 100644
|
|
--- a/tests/py/any/limit.t.json
|
|
+++ b/tests/py/any/limit.t.json
|
|
@@ -114,17 +114,6 @@
|
|
}
|
|
]
|
|
|
|
-# limit rate 1023000 mbytes/second
|
|
-[
|
|
- {
|
|
- "limit": {
|
|
- "per": "second",
|
|
- "rate": 1023000,
|
|
- "rate_unit": "mbytes"
|
|
- }
|
|
- }
|
|
-]
|
|
-
|
|
# limit rate 1 bytes / second
|
|
[
|
|
{
|
|
@@ -203,19 +192,6 @@
|
|
}
|
|
]
|
|
|
|
-# limit rate 1025000 mbytes/second burst 1023 mbytes
|
|
-[
|
|
- {
|
|
- "limit": {
|
|
- "burst": 1023,
|
|
- "burst_unit": "mbytes",
|
|
- "per": "second",
|
|
- "rate": 1025000,
|
|
- "rate_unit": "mbytes"
|
|
- }
|
|
- }
|
|
-]
|
|
-
|
|
# limit rate over 400/minute
|
|
[
|
|
{
|
|
@@ -343,18 +319,6 @@
|
|
}
|
|
]
|
|
|
|
-# limit rate over 1023000 mbytes/second
|
|
-[
|
|
- {
|
|
- "limit": {
|
|
- "inv": true,
|
|
- "per": "second",
|
|
- "rate": 1023000,
|
|
- "rate_unit": "mbytes"
|
|
- }
|
|
- }
|
|
-]
|
|
-
|
|
# limit rate over 1025 bytes/second burst 512 bytes
|
|
[
|
|
{
|
|
@@ -396,18 +360,3 @@
|
|
}
|
|
}
|
|
]
|
|
-
|
|
-# limit rate over 1025000 mbytes/second burst 1023 mbytes
|
|
-[
|
|
- {
|
|
- "limit": {
|
|
- "burst": 1023,
|
|
- "burst_unit": "mbytes",
|
|
- "inv": true,
|
|
- "per": "second",
|
|
- "rate": 1025000,
|
|
- "rate_unit": "mbytes"
|
|
- }
|
|
- }
|
|
-]
|
|
-
|
|
diff --git a/tests/py/any/limit.t.json.output b/tests/py/any/limit.t.json.output
|
|
index 5a95f5e..2c94d2d 100644
|
|
--- a/tests/py/any/limit.t.json.output
|
|
+++ b/tests/py/any/limit.t.json.output
|
|
@@ -118,19 +118,6 @@
|
|
}
|
|
]
|
|
|
|
-# limit rate 1023000 mbytes/second
|
|
-[
|
|
- {
|
|
- "limit": {
|
|
- "burst": 0,
|
|
- "burst_unit": "bytes",
|
|
- "per": "second",
|
|
- "rate": 1023000,
|
|
- "rate_unit": "mbytes"
|
|
- }
|
|
- }
|
|
-]
|
|
-
|
|
# limit rate over 400/minute
|
|
[
|
|
{
|
|
@@ -260,18 +247,3 @@
|
|
}
|
|
}
|
|
]
|
|
-
|
|
-# limit rate over 1023000 mbytes/second
|
|
-[
|
|
- {
|
|
- "limit": {
|
|
- "burst": 0,
|
|
- "burst_unit": "bytes",
|
|
- "inv": true,
|
|
- "per": "second",
|
|
- "rate": 1023000,
|
|
- "rate_unit": "mbytes"
|
|
- }
|
|
- }
|
|
-]
|
|
-
|
|
diff --git a/tests/py/any/limit.t.payload b/tests/py/any/limit.t.payload
|
|
index 0c7ee94..dc6701b 100644
|
|
--- a/tests/py/any/limit.t.payload
|
|
+++ b/tests/py/any/limit.t.payload
|
|
@@ -42,10 +42,6 @@ ip test-ip4 output
|
|
ip test-ip4 output
|
|
[ limit rate 10726932480/second burst 0 type bytes flags 0x0 ]
|
|
|
|
-# limit rate 1023000 mbytes/second
|
|
-ip test-ip4 output
|
|
- [ limit rate 1072693248000/second burst 0 type bytes flags 0x0 ]
|
|
-
|
|
# limit rate 1 bytes / second
|
|
ip
|
|
[ limit rate 1/second burst 0 type bytes flags 0x0 ]
|
|
@@ -71,10 +67,6 @@ ip test-ip4 output
|
|
ip test-ip4 output
|
|
[ limit rate 1074790400/second burst 1049600 type bytes flags 0x0 ]
|
|
|
|
-# limit rate 1025000 mbytes/second burst 1023 mbytes
|
|
-ip test-ip4 output
|
|
- [ limit rate 1074790400000/second burst 1072693248 type bytes flags 0x0 ]
|
|
-
|
|
# limit rate over 400/minute
|
|
ip test-ip4 output
|
|
[ limit rate 400/minute burst 5 type packets flags 0x1 ]
|
|
@@ -119,10 +111,6 @@ ip test-ip4 output
|
|
ip test-ip4 output
|
|
[ limit rate 10726932480/second burst 0 type bytes flags 0x1 ]
|
|
|
|
-# limit rate over 1023000 mbytes/second
|
|
-ip test-ip4 output
|
|
- [ limit rate 1072693248000/second burst 0 type bytes flags 0x1 ]
|
|
-
|
|
# limit rate over 1025 bytes/second burst 512 bytes
|
|
ip test-ip4 output
|
|
[ limit rate 1025/second burst 512 type bytes flags 0x1 ]
|
|
@@ -134,8 +122,3 @@ ip test-ip4 output
|
|
# limit rate over 1025 mbytes/second burst 1025 kbytes
|
|
ip test-ip4 output
|
|
[ limit rate 1074790400/second burst 1049600 type bytes flags 0x1 ]
|
|
-
|
|
-# limit rate over 1025000 mbytes/second burst 1023 mbytes
|
|
-ip test-ip4 output
|
|
- [ limit rate 1074790400000/second burst 1072693248 type bytes flags 0x1 ]
|
|
-
|