Skip to content

chore: add additional tailnet topology integration tests #13549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 12, 2024
Merged

chore: add additional tailnet topology integration tests #13549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3527862
derp server restart test
ethanndickson Jun 11, 2024
5c1c70e
fix
ethanndickson Jun 11, 2024
3fee5ed
server interface
ethanndickson Jun 11, 2024
5e73d63
WIP
ethanndickson Jun 11, 2024
f0da669
WIP
ethanndickson Jun 11, 2024
8eea4eb
coordinator restart
ethanndickson Jun 11, 2024
dde80f7
restart derp & coordinator
ethanndickson Jun 12, 2024
aa31cc0
impl'd review changes
ethanndickson Jun 12, 2024
286660f
impl'd review
ethanndickson Jun 12, 2024
023e0a7
cleaner query strings
ethanndickson Jun 12, 2024
6872ba1
fix
ethanndickson Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP
  • Loading branch information
@ethanndickson
ethanndickson committed Jun 11, 2024
commit 5e73d6375f1f5eaf2ee2ea52cd9ccaca01719a42
6 changes: 3 additions & 3 deletions tailnet/test/integration/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@ func (o SimpleServerOptions) Router(t *testing.T, logger slog.Logger) *chi.Mux {
return r
}

func (n *SimpleServerOptions) StartServer(t *testing.T, logger slog.Logger, listenAddr string) {
func (s *SimpleServerOptions) StartServer(t *testing.T, logger slog.Logger, listenAddr string) {
srv := http.Server{
Addr: listenAddr,
Handler: n.Router(t, logger),
Handler: s.Router(t, logger),
ReadTimeout: 10 * time.Second,
}
serveDone := make(chan struct{})
Expand All @@ -254,7 +254,7 @@ func (n *SimpleServerOptions) StartServer(t *testing.T, logger slog.Logger, list
_ = srv.Close()
<-serveDone
})
n.Server = &srv
s.Server = &srv
}

type NGINXServerOptions struct {
Expand Down
6 changes: 3 additions & 3 deletions tailnet/test/integration/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/coder/coder/v2/testutil"
)

func doRestart(t *testing.T, serverURL *url.URL, endpoint string) {
func sendRestart(t *testing.T, serverURL *url.URL, endpoint string) {
const reqTimeout = 2 * time.Second

serverURL, err := url.Parse(serverURL.String() + endpoint)
Expand Down Expand Up @@ -52,7 +52,7 @@ func TestSuite(t *testing.T, _ slog.Logger, serverURL *url.URL, conn *tailnet.Co
peerIP := tailnet.IPFromUUID(peer.ID)
_, _, _, err := conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
require.NoError(t, err, "ping peer")
doRestart(t, serverURL, "/derp/restart")
sendRestart(t, serverURL, "/derp/restart")
_, _, _, err = conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
require.NoError(t, err, "ping peer after derp restart")
})
Expand All @@ -61,7 +61,7 @@ func TestSuite(t *testing.T, _ slog.Logger, serverURL *url.URL, conn *tailnet.Co
peerIP := tailnet.IPFromUUID(peer.ID)
_, _, _, err := conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
require.NoError(t, err, "ping peer")
doRestart(t, serverURL, "/restart")
// TODO(ethan): restart here
_, _, _, err = conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
require.NoError(t, err, "ping peer after server restart")
})
Expand Down