Skip to content

Commit 852b6c7

Browse files
committed
Fix the go tests & rename main.go to cli.go
1 parent 7a215a9 commit 852b6c7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

main.go renamed to cli.go

File renamed without changes.

main_test.go renamed to cli_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestFromArgs(t *testing.T) {
3535
test := elt
3636
t.Run(test.name, func(t *testing.T) {
3737
t.Parallel()
38-
v, _, err := tailnetSrvFromArgs(test.args)
38+
v, _, err := TailnetSrvFromArgs(append([]string{"tsnsrv"}, test.args...))
3939
if test.ok {
4040
if err != nil {
4141
t.Errorf("Unexpected failure to parse %#v: %v", test.args, err)
@@ -64,7 +64,7 @@ func TestPrefixServing(t *testing.T) {
6464
ts := httptest.NewServer(testmux)
6565
defer ts.Close()
6666

67-
s, _, err := tailnetSrvFromArgs([]string{"-name", "TestPrefixServing", "-ephemeral",
67+
s, _, err := TailnetSrvFromArgs([]string{"tsnsrv", "-name", "TestPrefixServing", "-ephemeral",
6868
"-prefix", "/subpath", "-prefix", "/other/subpath",
6969
ts.URL,
7070
})
@@ -124,7 +124,7 @@ func TestRouting(t *testing.T) {
124124
ts := httptest.NewServer(testmux)
125125
defer ts.Close()
126126

127-
s, _, err := tailnetSrvFromArgs([]string{"-name", "TestRouting", "-ephemeral", "-prefix", test.fromPath, fmt.Sprintf("-stripPrefix=%v", test.strip),
127+
s, _, err := TailnetSrvFromArgs([]string{"tsnsrv", "-name", "TestRouting", "-ephemeral", "-prefix", test.fromPath, fmt.Sprintf("-stripPrefix=%v", test.strip),
128128
ts.URL + test.toURLPath,
129129
})
130130
require.NoError(t, err)
@@ -149,7 +149,7 @@ func TestHeaderSanitization(t *testing.T) {
149149
ts := httptest.NewServer(testmux)
150150
defer ts.Close()
151151

152-
s, _, err := tailnetSrvFromArgs([]string{"-name", "TestPrefixServing", "-ephemeral",
152+
s, _, err := TailnetSrvFromArgs([]string{"tsnsrv", "-name", "TestPrefixServing", "-ephemeral",
153153
ts.URL,
154154
})
155155
require.NoError(t, err)
@@ -187,7 +187,7 @@ func TestCustomHeaders(t *testing.T) {
187187
ts := httptest.NewServer(testmux)
188188
defer ts.Close()
189189

190-
s, _, err := tailnetSrvFromArgs([]string{"-name", "TestPrefixServing",
190+
s, _, err := TailnetSrvFromArgs([]string{"tsnsrv", "-name", "TestPrefixServing",
191191
"-upstreamHeader", fmt.Sprintf("%v: %v", test.hn, test.hv),
192192
ts.URL,
193193
})

0 commit comments

Comments
 (0)