From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 17 Feb 2021 11:18:38 +0000 (+0200)
Subject: lib: test-cpu-limit - Use test_assert_cmp()
X-Git-Tag: 2.3.15~369
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3178728945da381ea1cb1d20df412095c5807dc2;p=thirdparty%2Fdovecot%2Fcore.git

lib: test-cpu-limit - Use test_assert_cmp()
---

diff --git a/src/lib/test-cpu-limit.c b/src/lib/test-cpu-limit.c
index 05868baf3c..9c8b3e48bd 100644
--- a/src/lib/test-cpu-limit.c
+++ b/src/lib/test-cpu-limit.c
@@ -75,8 +75,8 @@ static void test_cpu_limit_simple(void)
 	cpu_limit_deinit(&climit);
 	cpu = get_cpu_time();
 	diff_msecs = timeval_diff_msecs(&cpu, &usage);
-	test_assert(diff_msecs >= 2000-ALLOW_MSECS_BELOW);
-	test_assert(diff_msecs <= 2000+ALLOW_MSECS_ABOVE);
+	test_assert_cmp(diff_msecs, >=, 2000 - ALLOW_MSECS_BELOW);
+	test_assert_cmp(diff_msecs, <=, 2000 + ALLOW_MSECS_ABOVE);
 
 	lib_signals_deinit();
 	test_end();
@@ -107,15 +107,15 @@ static void test_cpu_limit_nested(void)
 		cpu_limit_deinit(&climit2);
 		cpu = get_cpu_time();
 		diff_msecs = timeval_diff_msecs(&cpu, &usage2);
-		test_assert(diff_msecs >= 1000-ALLOW_MSECS_BELOW);
-		test_assert(diff_msecs <= 1000+ALLOW_MSECS_ABOVE);
+		test_assert_cmp(diff_msecs, >=, 1000 - ALLOW_MSECS_BELOW);
+		test_assert_cmp(diff_msecs, <=, 1000 + ALLOW_MSECS_ABOVE);
 	}
 
 	cpu_limit_deinit(&climit1);
 	cpu = get_cpu_time();
 	diff_msecs = timeval_diff_msecs(&cpu, &usage1);
-	test_assert(diff_msecs >= 3000-ALLOW_MSECS_BELOW);
-	test_assert(diff_msecs <= 3000+ALLOW_MSECS_ABOVE);
+	test_assert_cmp(diff_msecs, >=, 3000 - ALLOW_MSECS_BELOW);
+	test_assert_cmp(diff_msecs, <=, 3000 + ALLOW_MSECS_ABOVE);
 
 	lib_signals_deinit();
 	test_end();
@@ -144,15 +144,15 @@ static void test_cpu_limit_nested(void)
 		cpu_limit_deinit(&climit2);
 		cpu = get_cpu_time();
 		diff_msecs = timeval_diff_msecs(&cpu, &usage2);
-		test_assert(diff_msecs >= 1000-ALLOW_MSECS_BELOW);
-		test_assert(diff_msecs <= 1000+ALLOW_MSECS_ABOVE);
+		test_assert_cmp(diff_msecs, >=, 1000 - ALLOW_MSECS_BELOW);
+		test_assert_cmp(diff_msecs, <=, 1000 + ALLOW_MSECS_ABOVE);
 	}
 
 	cpu_limit_deinit(&climit1);
 	cpu = get_cpu_time();
 	diff_msecs = timeval_diff_msecs(&cpu, &usage1);
-	test_assert(diff_msecs >= 3000-ALLOW_MSECS_BELOW);
-	test_assert(diff_msecs <= 3000+ALLOW_MSECS_ABOVE);
+	test_assert_cmp(diff_msecs, >=, 3000 - ALLOW_MSECS_BELOW);
+	test_assert_cmp(diff_msecs, <=, 3000 + ALLOW_MSECS_ABOVE);
 
 	i_unlink_if_exists(test_path);
 	lib_signals_deinit();