Unit-tests oh joy! Adding some much needed tests. These will get bett…

…er and more robust
deckarep · Jan 6, 2024 · 64d1d59 · 64d1d59
1 parent 6002e37
commit 64d1d59
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/pkg/remote_cmd.go b/pkg/remote_cmd.go
@@ -33,6 +33,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"runtime"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -147,7 +148,7 @@ func ExecuteClusterRemoteCmd(ctx context.Context, w io.Writer, hosts []RemoteCmd
 }
 
 func executeRemoteCmd(ctx context.Context, idx int, host string, alias string, remoteCmd string, outputChan chan<- hostLine) error {
-	binPath, err := utils.SelectBinaryPath(binarySearchPathCandidates)
+	binPath, err := utils.SelectBinaryPath(runtime.GOOS, binarySearchPathCandidates)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/tailscale_cli/tailscale_cli_query.go b/pkg/tailscale_cli/tailscale_cli_query.go
@@ -27,6 +27,7 @@ package tailscale_cli
 
 import (
 	"os/exec"
+	"runtime"
 	"strings"
 
 	"github.com/deckarep/tips/pkg/utils"
@@ -58,7 +59,7 @@ type DeviceInfo struct {
 }
 
 func GetVersion() (string, error) {
-	confirmedPath, err := utils.SelectBinaryPath(binarySearchPathCandidates)
+	confirmedPath, err := utils.SelectBinaryPath(runtime.GOOS, binarySearchPathCandidates)
 	if err != nil {
 		return "", err
 	}
@@ -73,7 +74,7 @@ func GetVersion() (string, error) {
 }
 
 func GetDevicesState() (map[string]DeviceInfo, error) {
-	confirmedPath, err := utils.SelectBinaryPath(binarySearchPathCandidates)
+	confirmedPath, err := utils.SelectBinaryPath(runtime.GOOS, binarySearchPathCandidates)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -32,9 +32,9 @@ import (
 	"runtime"
 )
 
-func SelectBinaryPath(candidates map[string][]string) (string, error) {
+func SelectBinaryPath(platform string, candidates map[string][]string) (string, error) {
 	osSelected := runtime.GOOS
-	if paths, exists := candidates[runtime.GOOS]; exists {
+	if paths, exists := candidates[platform]; exists {
 		for _, p := range paths {
 			if confirmedPath, err := exec.LookPath(p); err == nil {
 				return confirmedPath, nil

diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
@@ -6,18 +6,19 @@ import (
 )
 
 func TestSelectBinaryPath(t *testing.T) {
-	// TODO: this will fail on other platforms.
 	const (
+		tsPathBogus  = "/Applications/Something/That/Does/Not/Exist"
 		tsPathDarwin = "/Applications/Tailscale.app/Contents/MacOS/Tailscale"
 	)
 
 	c := map[string][]string{
 		"darwin": {
+			tsPathBogus,
 			tsPathDarwin,
 		},
 	}
 
-	result, err := SelectBinaryPath(c)
+	result, err := SelectBinaryPath("darwin", c)
 	if err != nil {
 		t.Errorf("expected nil err, got: %s", err.Error())
 	}