From 52972679e6b8d368a7f7bb625d660f5bfa282f5a Mon Sep 17 00:00:00 2001
From: Dan Bond <danbond@protonmail.com>
Date: Tue, 13 Jul 2021 11:59:30 -0700
Subject: [PATCH] cmd/tailscale: improve web server test structure

Signed-off-by: Dan Bond <danbond@protonmail.com>
---
 cmd/tailscale/cli/web_test.go | 46 ++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/cmd/tailscale/cli/web_test.go b/cmd/tailscale/cli/web_test.go
index 04e2b1762..c2e060d2b 100644
--- a/cmd/tailscale/cli/web_test.go
+++ b/cmd/tailscale/cli/web_test.go
@@ -7,35 +7,37 @@
 import "testing"
 
 func TestUrlOfListenAddr(t *testing.T) {
-	t.Parallel()
-
-	testTable := map[string]struct {
-		addr     string
-		expected string
+	tests := []struct {
+		name     string
+		in, want string
 	}{
-		"TestLocalhost": {
-			addr:     "localhost:8088",
-			expected: "http://localhost:8088",
+		{
+			name: "TestLocalhost",
+			in:   "localhost:8088",
+			want: "http://localhost:8088",
 		},
-		"TestNoHost": {
-			addr:     ":8088",
-			expected: "http://127.0.0.1:8088",
+		{
+			name: "TestNoHost",
+			in:   ":8088",
+			want: "http://127.0.0.1:8088",
 		},
-		"TestExplicitHost": {
-			addr:     "127.0.0.2:8088",
-			expected: "http://127.0.0.2:8088",
+		{
+			name: "TestExplicitHost",
+			in:   "127.0.0.2:8088",
+			want: "http://127.0.0.2:8088",
 		},
-		"TestIPv6": {
-			addr:     "[::1]:8088",
-			expected: "http://[::1]:8088",
+		{
+			name: "TestIPv6",
+			in:   "[::1]:8088",
+			want: "http://[::1]:8088",
 		},
 	}
 
-	for name, test := range testTable {
-		t.Run(name, func(t *testing.T) {
-			url := urlOfListenAddr(test.addr)
-			if url != test.expected {
-				t.Errorf("expected url: '%s', got: '%s'", test.expected, url)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			url := urlOfListenAddr(tt.in)
+			if url != tt.want {
+				t.Errorf("expected url: %q, got: %q", tt.want, url)
 			}
 		})
 	}