Merge 58e4a66b42 into f6276ab9d2

Use a more direct and less error-prone return value
Signed-off-by: pinglanlu <pinglanlu@outlook.com>
2024-11-26 08:53:05 +00:00 · 2024-11-23 15:52:32 -05:00 · 2024-11-12 14:22:35 +08:00
1 changed files with 1 additions and 1 deletions
--- a/integration/tsic/tsic.go
+++ b/integration/tsic/tsic.go
@ -637,7 +637,7 @@ func (t *TailscaleInContainer) Netmap() (*netmap.NetworkMap, error) {
 		return nil, fmt.Errorf("saving netmap to /tmp/control: %w", err)
 	}

-	return &nm, err
+	return &nm, nil
 }

 // Netmap returns the current Netmap (netmap.NetworkMap) of the Tailscale instance.
Author	SHA1	Message	Date
pinglanlu	18f54c9079	Merge `58e4a66b42` into `f6276ab9d2`	2024-11-23 15:52:32 -05:00
pinglanlu	58e4a66b42	Use a more direct and less error-prone return value Signed-off-by: pinglanlu <pinglanlu@outlook.com>	2024-11-12 14:22:35 +08:00