[PATCH 0/1] MR2825: dnsapi/tests: Ignore OPT records in the CNAME tests.

[Francois Gouget (＠fgouget)]

This will hopefully fix the failures on Rémi's test machines:
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54848

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2825

[PATCH 1/1] dnsapi/tests: Ignore OPT records in the CNAME tests.

[Francois Gouget]

From: Francois Gouget <fgouget(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54848
---
 dlls/dnsapi/tests/query.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c
index e4a821e1ce8..61b7ef093c3 100644
--- a/dlls/dnsapi/tests/query.c
+++ b/dlls/dnsapi/tests/query.c
@@ -110,7 +110,7 @@ static void test_DnsQuery(void)
     {
         ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n",
            wine_dbgstr_w(ptr->pName));
-        ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA,
+        ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA || ptr->wType == DNS_TYPE_OPT,
            "unexpected record type %d\n", ptr->wType);
         ptr = ptr->pNext;
     }
@@ -145,10 +145,13 @@ static void test_DnsQuery(void)
 
     while (ptr)
     {
-        ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n",
-           wine_dbgstr_w(ptr->pName));
-        ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA,
-           "unexpected record type %d\n", ptr->wType);
+        if (ptr->wType != DNS_TYPE_OPT)
+        {
+            ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n",
+               wine_dbgstr_w(ptr->pName));
+            ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA,
+               "unexpected record type %d\n", ptr->wType);
+        }
         ptr = ptr->pNext;
     }
     DnsRecordListFree(rec, DnsFreeRecordList);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2825