Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 18 Apr 2023 17:15:08 GMT
From:      =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 1bc6dcc287fa - main - renice: Factor out common code in tests.
Message-ID:  <202304181715.33IHF8f8093472@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=1bc6dcc287fa80af74768c4e2b2a1d7511ba1729

commit 1bc6dcc287fa80af74768c4e2b2a1d7511ba1729
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-04-18 17:14:11 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-04-18 17:14:25 +0000

    renice: Factor out common code in tests.
    
    Furthermore, prefer test -eq (which ignores whitespace) over a strict string equality test when comparing numerical values.
    
    MFC after:      1 week
    Sponsored by:   Klara, Inc.
    Reviewed by:    thj
    Differential Revision:  https://reviews.freebsd.org/D39650
---
 usr.bin/renice/tests/renice_test.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/usr.bin/renice/tests/renice_test.sh b/usr.bin/renice/tests/renice_test.sh
index 79286a0f86bd..8a4df7879ad4 100755
--- a/usr.bin/renice/tests/renice_test.sh
+++ b/usr.bin/renice/tests/renice_test.sh
@@ -12,6 +12,12 @@ _renice() {
 	atf_check -o empty -e ignore -s exit:0 renice "$@"
 }
 
+atf_check_nice_value() {
+	local pid=$1
+	local nice=$2
+	atf_check test "$(ps -o nice= -p $pid)" -eq "$nice"
+}
+
 atf_test_case renice_abs_pid
 renice_abs_pid_head() {
 	atf_set "descr" "Set a process's nice number to an absolute value"
@@ -23,7 +29,7 @@ renice_abs_pid_body() {
 	nice="$(ps -o nice= -p $pid)"
 	incr=3
 	_renice $((nice+incr)) $pid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	kill $pid
 }
 
@@ -40,7 +46,7 @@ renice_rel_pid_body() {
 	_renice -n $incr $pid
 	_renice -p -n $incr $pid
 	_renice -n $incr -p $pid
-	atf_check_equal $((nice+incr+incr+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr+incr+incr))
 	kill $pid
 }
 
@@ -56,7 +62,7 @@ renice_abs_pgid_body() {
 	nice="$(ps -o nice= -p $pid)"
 	incr=3
 	_renice $((nice+incr)) -g $pgid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	kill $pid
 }
 
@@ -73,7 +79,7 @@ renice_rel_pgid_body() {
 	incr=3
 	_renice -g -n $incr $pgid
 	_renice -n $incr -g $pgid
-	atf_check_equal $((nice+incr+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr+incr))
 	kill $pid
 }
 
@@ -88,7 +94,7 @@ renice_abs_user_body() {
 	nice="$(ps -o nice= -p $pid)"
 	incr=3
 	_renice $((nice+incr)) -u $TEST_USER
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	kill $pid
 }
 
@@ -104,7 +110,7 @@ renice_rel_user_body() {
 	incr=3
 	_renice -u -n $incr $TEST_USER
 	_renice -n $incr -u $TEST_USER
-	atf_check_equal $((nice+incr+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr+incr))
 	kill $pid
 }
 
@@ -121,29 +127,29 @@ renice_delim_body() {
 	# without -p
 	: $((incr=incr+1))
 	_renice -- $((nice+incr)) $pid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	: $((incr=incr+1))
 	_renice $((nice+incr)) -- $pid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	: $((incr=incr+1))
 	_renice $((nice+incr)) $pid --
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	# with -p
 	: $((incr=incr+1))
 	_renice -p -- $((nice+incr)) $pid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	: $((incr=incr+1))
 	_renice -p $((nice+incr)) -- $pid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	: $((incr=incr+1))
 	_renice -p $((nice+incr)) $pid --
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	: $((incr=incr+1))
 	_renice $((nice+incr)) -p -- $pid
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	: $((incr=incr+1))
 	_renice $((nice+incr)) -p $pid --
-	atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)"
+	atf_check_nice_value $pid $((nice+incr))
 	kill $pid
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304181715.33IHF8f8093472>