TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

whats up with them windows routes

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-09-23 10:33:52 +02:00
parent 3d71201428
commit 031f1a2315
No known key found for this signature in database
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tsnet/tsnet_test.go
View File

@ -996,9 +996,17 @@ func TestUserMetrics(t *testing.T) {
mustDirect(t, t.Logf, lc1, lc2) mustDirect(t, t.Logf, lc1, lc2)
wantRoutes := 3
// if runtime.GOOS == "windows" {
// // Windows doesn't support the being a subnet router
// // in userspace mode (tsnet), so the routes are not
// // set.
// wantRoutes = 0
// }
// Wait for the routes to be propagated to node 1 to ensure // Wait for the routes to be propagated to node 1 to ensure
// that the metrics are up-to-date. // that the metrics are up-to-date.
waitForCondition(t, "primary routes available for node1", 30*time.Second, func() bool { waitForCondition(t, "primary routes available for node1", 90*time.Second, func() bool {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
status1, err := lc1.Status(ctx) status1, err := lc1.Status(ctx)
@ -1006,9 +1014,11 @@ func TestUserMetrics(t *testing.T) {
t.Logf("getting status: %s", err) t.Logf("getting status: %s", err)
return false return false
} }
t.Logf("status pr1: %v", status1.Self.PrimaryRoutes) // if runtime.GOOS == "windows" {
t.Logf("status r1: %v", status1.Self.AllowedIPs) // return true
return status1.Self.PrimaryRoutes != nil && status1.Self.PrimaryRoutes.Len() == 3 // } else {
return status1.Self.PrimaryRoutes != nil && status1.Self.PrimaryRoutes.Len() == wantRoutes
// }
}) })
bytesToSend := 10 * 1024 * 1024 bytesToSend := 10 * 1024 * 1024
@ -1054,7 +1064,7 @@ func TestUserMetrics(t *testing.T) {
// - 192.0.2.0/24 // - 192.0.2.0/24
// - 192.0.5.1/32 // - 192.0.5.1/32
// - 0.0.0.0/0 // - 0.0.0.0/0
if got, want := parsedMetrics1["tailscaled_approved_routes,"], 3.0; got != want { if got, want := parsedMetrics1["tailscaled_approved_routes,"], float64(wantRoutes); got != want {
t.Errorf("metrics1, tailscaled_approved_routes: got %v, want %v", got, want) t.Errorf("metrics1, tailscaled_approved_routes: got %v, want %v", got, want)
} }
@ -1067,7 +1077,7 @@ func TestUserMetrics(t *testing.T) {
// - 192.0.2.0/24 // - 192.0.2.0/24
// - 192.0.5.1/32 // - 192.0.5.1/32
// - 0.0.0.0/0 // - 0.0.0.0/0
if got, want := parsedMetrics1["tailscaled_primary_routes,"], 3.0; got != want { if got, want := parsedMetrics1["tailscaled_primary_routes,"], float64(wantRoutes); got != want {
t.Errorf("metrics1, tailscaled_primary_routes: got %v, want %v", got, want) t.Errorf("metrics1, tailscaled_primary_routes: got %v, want %v", got, want)
} }