From 5de8f42c9c4d4450f770b6b4fadba86296dfbbbd Mon Sep 17 00:00:00 2001
From: Anton Tolchanov <anton@tailscale.com>
Date: Thu, 10 Apr 2025 14:07:52 +0000
Subject: [PATCH] WIP: debug DNS test

---
 .github/workflows/test.yml             | 10 +++++-----
 tstest/integration/integration_test.go |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 666bd2962..9b350b338 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ concurrency:
 
 jobs:
   race-root-integration:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false # don't abort the entire matrix if one element fails
       matrix:
@@ -54,7 +54,7 @@ jobs:
     - name: build test wrapper
       run: ./tool/go build -o /tmp/testwrapper ./cmd/testwrapper
     - name: integration tests as root
-      run: PATH=$PWD/tool:$PATH /tmp/testwrapper -exec "sudo -E" -race ./tstest/integration/
+      run: PATH=$PWD/tool:$PATH /tmp/testwrapper -exec "sudo -E" -race ./tstest/integration/ -verbose-tailscaled -verbose-tailscale
       env:
         TS_TEST_SHARD: ${{ matrix.shard }}
 
@@ -561,7 +561,7 @@ jobs:
   notify_slack:
     if: always()
     # Any of these jobs failing causes a slack notification.
-    needs: 
+    needs:
       - android
       - test
       - windows
@@ -578,7 +578,7 @@ jobs:
       - staticcheck
     runs-on: ubuntu-22.04
     steps:
-    - name: notify  
+    - name: notify
       # Only notify slack for merged commits, not PR failures.
       #
       # It may be tempting to move this condition into the job's 'if' block, but
@@ -595,7 +595,7 @@ jobs:
           {
             "attachments": [{
               "title": "Failure: ${{ github.workflow }}",
-              "title_link": "https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks",         
+              "title_link": "https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks",
               "text": "${{ github.repository }}@${{ github.ref_name }}: <https://github.com/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>",
               "fields": [{ "value": ${{ toJson(github.event.head_commit.message) }}, "short": false }],
               "footer": "${{ github.event.head_commit.committer.name }} at ${{ github.event.head_commit.timestamp }}",
diff --git a/tstest/integration/integration_test.go b/tstest/integration/integration_test.go
index 81a1cd9dc..351acc034 100644
--- a/tstest/integration/integration_test.go
+++ b/tstest/integration/integration_test.go
@@ -1153,6 +1153,11 @@ func TestDNSOverTCPIntervalResolver(t *testing.T) {
 		t.Fatalf("error converting self dns name to fqdn: %v", err)
 	}
 
+	out, err := n1.Tailscale("status").Output()
+	t.Logf("XXX: %s\n%s", err, string(out))
+	out, err = n1.Tailscale("dns", "status").Output()
+	t.Logf("XXX: %s\n%s", err, string(out))
+
 	cases := []struct {
 		network     string
 		serviceAddr netip.Addr
@@ -1170,6 +1175,7 @@ func TestDNSOverTCPIntervalResolver(t *testing.T) {
 		err = tstest.WaitFor(time.Second*5, func() error {
 			m := new(dns.Msg)
 			m.SetQuestion(selfDNSName.WithTrailingDot(), dns.TypeA)
+			t.Logf("XXX: dig %s @%s", selfDNSName.WithTrailingDot(), c.serviceAddr.String())
 			conn, err := net.DialTimeout(c.network, net.JoinHostPort(c.serviceAddr.String(), "53"), time.Second*1)
 			if err != nil {
 				return err