Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 39 insertions, 0 deletions

diff --git a/workhorse/internal/upstream/roundtripper/roundtripper_test.go b/workhorse/internal/upstream/roundtripper/roundtripper_test.go
new file mode 100644
index 00000000000..79ffa244918
--- /dev/null
+++ b/workhorse/internal/upstream/roundtripper/roundtripper_test.go
@@ -0,0 +1,39 @@
+package roundtripper
+
+import (
+	"strconv"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestMustParseAddress(t *testing.T) {
+	successExamples := []struct{ address, scheme, expected string }{
+		{"1.2.3.4:56", "http", "1.2.3.4:56"},
+		{"[::1]:23", "http", "::1:23"},
+		{"4.5.6.7", "http", "4.5.6.7:http"},
+	}
+	for i, example := range successExamples {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			require.Equal(t, example.expected, mustParseAddress(example.address, example.scheme))
+		})
+	}
+}
+
+func TestMustParseAddressPanic(t *testing.T) {
+	panicExamples := []struct{ address, scheme string }{
+		{"1.2.3.4", ""},
+		{"1.2.3.4", "https"},
+	}
+
+	for i, panicExample := range panicExamples {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			defer func() {
+				if r := recover(); r == nil {
+					t.Fatal("expected panic")
+				}
+			}()
+			mustParseAddress(panicExample.address, panicExample.scheme)
+		})
+	}
+}