From: Lennart Poettering Date: Mon, 29 Aug 2022 09:40:39 +0000 (+0200) Subject: test: don't mistake error for success X-Git-Tag: v252-rc1~288 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18f806b8d9597c6a7b590984e3c65d5fd9cb56b0;p=thirdparty%2Fsystemd.git test: don't mistake error for success Follow-up for acd3c8662465c1f36c0c0fc974584694928d9234 --- diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 882b376f6f2..c430110acda 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -49,7 +49,7 @@ TEST(condition_test_path) { condition = condition_new(CONDITION_PATH_EXISTS, "/bin/sh", false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); condition = condition_new(CONDITION_PATH_EXISTS, "/bin/s?", false, false); @@ -1154,7 +1154,7 @@ TEST(condition_test_os_release) { condition = condition_new(CONDITION_OS_RELEASE, "", false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); /* load_os_release_pairs() removes quotes, we have to add them back, @@ -1164,7 +1164,7 @@ TEST(condition_test_os_release) { key_value_pair = strjoina(os_release_pairs[0], "=", quote, os_release_pairs[1], quote); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); key_value_pair = strjoina(os_release_pairs[0], "!=", quote, os_release_pairs[1], quote); @@ -1193,7 +1193,7 @@ TEST(condition_test_os_release) { key_value_pair = strjoina("VERSION_ID", "=", version_id); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); key_value_pair = strjoina("VERSION_ID", "!=", version_id); @@ -1205,19 +1205,19 @@ TEST(condition_test_os_release) { key_value_pair = strjoina("VERSION_ID", "<=", version_id); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); key_value_pair = strjoina("VERSION_ID", ">=", version_id); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); key_value_pair = strjoina("VERSION_ID", "<", version_id, ".1"); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); key_value_pair = strjoina("VERSION_ID", ">", version_id, ".1"); @@ -1229,7 +1229,7 @@ TEST(condition_test_os_release) { key_value_pair = strjoina("VERSION_ID", "=", version_id, " ", os_release_pairs[0], "=", quote, os_release_pairs[1], quote); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); key_value_pair = strjoina("VERSION_ID", "!=", version_id, " ", os_release_pairs[0], "=", quote, os_release_pairs[1], quote); @@ -1253,7 +1253,7 @@ TEST(condition_test_os_release) { key_value_pair = strjoina("VERSION_ID", "<", version_id, ".1", " ", os_release_pairs[0], "=", quote, os_release_pairs[1], quote); condition = condition_new(CONDITION_OS_RELEASE, key_value_pair, false, false); assert_se(condition); - assert_se(condition_test(condition, environ)); + assert_se(condition_test(condition, environ) > 0); condition_free(condition); }