From: Phil Sutter <phil@nwl.cc>
Date: Fri, 11 Oct 2024 09:22:44 +0000 (+0200)
Subject: tests: shell: Join arithmetic statements in maps/vmap_timeout
X-Git-Tag: v1.1.2~137
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ff0846371c0c1cca41fd61ef2c481248684b8aa9;p=thirdparty%2Fnftables.git

tests: shell: Join arithmetic statements in maps/vmap_timeout

In light of the recent typo fix, go an extra step and merge the modulo
and offset adjustment in a single term.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/tests/shell/testcases/maps/vmap_timeout b/tests/shell/testcases/maps/vmap_timeout
index 6d73f3cc..8ac7e8e7 100755
--- a/tests/shell/testcases/maps/vmap_timeout
+++ b/tests/shell/testcases/maps/vmap_timeout
@@ -9,8 +9,7 @@ $NFT -f $dumpfile
 
 port=23
 for i in $(seq 1 100) ; do
-	timeout=$((RANDOM%5))
-	timeout=$((timeout+1))
+	timeout=$((RANDOM % 5 + 1))
 	expire=$((RANDOM%timeout))
 	j=1
 
@@ -28,11 +27,9 @@ for i in $(seq 1 100) ; do
 
 	port=$((port + 1))
 	for j in $(seq 2 400); do
-		timeout=$((RANDOM%5))
-		timeout=$((timeout+1))
+		timeout=$((RANDOM % 5 + 1))
 		expire=$((RANDOM%timeout))
-		utimeout=$((RANDOM%5))
-		utimeout=$((utimeout+1))
+		utimeout=$((RANDOM % 5 + 1))
 
 		timeout_str="timeout ${timeout}s"
 		expire_str=""