Commit42434e7

committed

test

1 parentbd1340a commit42434e7Copy full SHA for 42434e7

File tree

+18

-11

lines changed

+18

-11

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ import (`
`5`	`5`	`"net/netip"`
`6`	`6`
`7`	`7`	`"tailscale.com/wgengine/router"`
	`8`	`+`
	`9`	`+"github.com/coder/coder/v2/coderd/util/ptr"`
`8`	`10`	`)`
`9`	`11`
`10`	`12`	`funcNewRouter(t*Tunnel) router.Router {`
`@@ -70,7 +72,7 @@ func convertRouterConfig(cfg router.Config) NetworkSettingsRequest {`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`return&NetworkSettingsRequest{`
`73`		`-Mtu:uint32(cfg.NewMTU),`
	`75`	`+Mtu:ptr.Ref(uint32(cfg.NewMTU)),`
`74`	`76`	`Ipv4Settings:&NetworkSettingsRequest_IPv4Settings{`
`75`	`77`	`Addrs:v4LocalAddrs,`
`76`	`78`	`IncludedRoutes:v4Routes,`
`@@ -81,8 +83,8 @@ func convertRouterConfig(cfg router.Config) NetworkSettingsRequest {`
`81`	`83`	`IncludedRoutes:v6Routes,`
`82`	`84`	`ExcludedRoutes:v6ExcludedRoutes,`
`83`	`85`	`},`
`84`		`-TunnelOverheadBytes:0,// N/A`
`85`		`-TunnelRemoteAddress:"",// N/A`
	`86`	`+TunnelOverheadBytes:nil,// N/A`
	`87`	`+TunnelRemoteAddress:nil,// N/A`
`86`	`88`	`}`
`87`	`89`	`}`
`88`	`90`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/stretchr/testify/require"`
`8`	`8`	`"tailscale.com/wgengine/router"`
	`9`	`+`
	`10`	`+"github.com/coder/coder/v2/coderd/util/ptr"`
`9`	`11`	`)`
`10`	`12`
`11`	`13`	`funcTestConvertRouterConfig(t*testing.T) {`
`@@ -25,7 +27,7 @@ func TestConvertRouterConfig(t *testing.T) {`
`25`	`27`	`NewMTU:1500,`
`26`	`28`	`},`
`27`	`29`	`expected:&NetworkSettingsRequest{`
`28`		`-Mtu:1500,`
	`30`	`+Mtu:ptr.Ref(uint32(1500)),`
`29`	`31`	`Ipv4Settings:&NetworkSettingsRequest_IPv4Settings{`
`30`	`32`	`Addrs: []string{"100.64.0.1/32"},`
`31`	`33`	`IncludedRoutes: []*NetworkSettingsRequest_IPv4Settings_IPv4Route{`
`@@ -62,6 +64,11 @@ func TestConvertRouterConfig(t *testing.T) {`
`62`	`64`	`},`
`63`	`65`	`},`
`64`	`66`	`},`
	`67`	`+{`
	`68`	`+name:"Nil",`
	`69`	`+cfg:nil,`
	`70`	`+expected:&NetworkSettingsRequest{},`
	`71`	`+},`
`65`	`72`	`}`
`66`	`73`	`//nolint:paralleltest // outdated rule`
`67`	`74`	`for_,tt:=rangetests {`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"google.golang.org/protobuf/types/known/timestamppb"`
`17`	`17`	`"tailscale.com/util/dnsname"`
`18`	`18`
	`19`	`+"github.com/coder/coder/v2/coderd/util/ptr"`
`19`	`20`	`"github.com/coder/coder/v2/tailnet"`
`20`	`21`	`"github.com/coder/coder/v2/tailnet/proto"`
`21`	`22`	`"github.com/coder/coder/v2/testutil"`
`@@ -245,7 +246,7 @@ func TestTunnel_NetworkSettings(t *testing.T) {`
`245`	`246`	`// When: we inform the tunnel of network settings`
`246`	`247`	`gofunc() {`
`247`	`248`	`err:=tun.ApplyNetworkSettings(ctx,&NetworkSettingsRequest{`
`248`		`-Mtu:1200,`
	`249`	`+Mtu:ptr.Ref(uint32(1200)),`
`249`	`250`	`})`
`250`	`251`	`errCh<-err`
`251`	`252`	`}()`
`@@ -317,12 +318,8 @@ func TestUpdater_createPeerUpdate(t *testing.T) {`
`317`	`318`	`},`
`318`	`319`	`})`
`319`	`320`	`require.Len(t,update.UpsertedAgents,1)`
`320`		`-slices.SortFunc(update.UpsertedAgents[0].Fqdn,func(a,bstring)int {`
`321`		`-returnstrings.Compare(a,b)`
`322`		`-})`
`323`		`-slices.SortFunc(update.DeletedAgents[0].Fqdn,func(a,bstring)int {`
`324`		`-returnstrings.Compare(a,b)`
`325`		`-})`
	`321`	`+slices.SortFunc(update.UpsertedAgents[0].Fqdn,strings.Compare)`
	`322`	`+slices.SortFunc(update.DeletedAgents[0].Fqdn,strings.Compare)`
`326`	`323`	`require.Equal(t,update,&PeerUpdate{`
`327`	`324`	`UpsertedWorkspaces: []*Workspace{`
`328`	`325`	`{Id:w1ID[:],Name:"w1",Status:Workspace_Status(proto.Workspace_STARTING)},`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ message Agent {`
`117`	`117`	`// macOS. It is a request/response message with response NetworkSettingsResponse`
`118`	`118`	`messageNetworkSettingsRequest {`
`119`	`119`	`optionaluint32tunnel_overhead_bytes=1;`
	`120`	`+// If zero, the MTU is unchanged. If null, it should be reset.`
`120`	`121`	`optionaluint32mtu=2;`
`121`	`122`
`122`	`123`	`messageDNSSettings {`

Comments

(0)