From 4f94470dedce4d442db414999db47cce539c3b07 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 7 Aug 2024 13:44:19 +0900 Subject: [PATCH] test: replace ASSERT_TRUE() for dns_cache_lookup() with ASSERT_OK_POSITIVE() As it may return negative errno on error, and returns number of found entries on success. --- src/resolve/test-dns-cache.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/resolve/test-dns-cache.c b/src/resolve/test-dns-cache.c index dc9152e3f7f..2413ad795f0 100644 --- a/src/resolve/test-dns-cache.c +++ b/src/resolve/test-dns-cache.c @@ -555,7 +555,7 @@ TEST(dns_cache_lookup_success) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.example.com"); ASSERT_NOT_NULL(key); query_flags = 0; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); ASSERT_EQ(cache.n_hit, 1u); ASSERT_EQ(cache.n_miss, 0u); @@ -592,7 +592,7 @@ TEST(dns_cache_lookup_clamp_ttl) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.example.com"); ASSERT_NOT_NULL(key); query_flags = SD_RESOLVED_CLAMP_TTL; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); ASSERT_EQ(cache.n_hit, 1u); ASSERT_EQ(cache.n_miss, 0u); @@ -635,7 +635,7 @@ TEST(dns_cache_lookup_returns_most_recent_response) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.example.com"); ASSERT_NOT_NULL(key); query_flags = 0; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); ASSERT_EQ(cache.n_hit, 1u); ASSERT_EQ(cache.n_miss, 0u); @@ -680,7 +680,7 @@ TEST(dns_cache_lookup_retains_multiple_answers_from_one_response) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.example.com"); ASSERT_NOT_NULL(key); query_flags = 0; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); ASSERT_EQ(cache.n_hit, 1u); ASSERT_EQ(cache.n_miss, 0u); @@ -724,7 +724,7 @@ TEST(dns_cache_lookup_nxdomain) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "www.example.com"); ASSERT_NOT_NULL(key); query_flags = 0; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); ASSERT_EQ(cache.n_hit, 1u); ASSERT_EQ(cache.n_miss, 0u); @@ -809,7 +809,7 @@ TEST(dns_cache_lookup_mdns_multiple_shared_responses_are_cached) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "example.com"); ASSERT_NOT_NULL(key); query_flags = 0; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); dns_resource_key_unref(key); ASSERT_EQ(cache.n_hit, 1u); @@ -865,7 +865,7 @@ TEST(dns_cache_lookup_mdns_multiple_unshared_responses_are_not_cached) { key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, "example.com"); ASSERT_NOT_NULL(key); query_flags = 0; - ASSERT_TRUE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); + ASSERT_OK_POSITIVE(dns_cache_lookup(&cache, key, query_flags, &ret_rcode, &ret_answer, &ret_full_packet, &ret_query_flags, NULL)); dns_resource_key_unref(key); ASSERT_EQ(cache.n_hit, 1u); -- 2.47.3