mac build and testing

README.md

@@ -4,14 +4,19 @@ https://github.com/amidaware/tacticalrmm
 #### building the agent - linux
 ```
 env CGO_ENABLED=0 GOOS=<GOOS> GOARCH=<GOARCH> go build -ldflags "-s -w -X 'main.version=v2.0.4'"
-example: env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X 'main.version=v2.0.4' -o build/output/rmmagent"
+example: env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X 'main.version=v2.0.4'" -o build/output/rmmagent
+```
+
+#### building the agent - macos
+```
+env GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w -X 'main.version=v2.0.4'" -o build/output/rmmagent
 ```
 
 #### building the agent - windows
 ```
 go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo
 go generate
-$env:CGO_ENABLED="0";$env:GOOS="windows";$env:GOARCH="amd64"; go build -ldflags "-s -w -X 'main.version=v2.0.4' -o build/output/tacticalrmm.exe"
+$env:CGO_ENABLED="0";$env:GOOS="windows";$env:GOARCH="amd64"; go build -ldflags "-s -w -X 'main.version=v2.0.4'" -o build/output/tacticalrmm.exe
 ```
 
 ### tests

agent/agent_test.go

@@ -18,3 +18,24 @@ func TestAgentId(t *testing.T) {
 		t.Logf("AgentID: %s", a.AgentID)
 	}
 }
+
+func TestSystemRebootRequired(t *testing.T) {
+	a := New(lg, version)
+	result, err := a.SystemRebootRequired()
+	if err != nil {
+		t.Error(err)
+	}
+
+	t.Logf("Result: %t", result)
+}
+
+func TestLoggedOnUser(t *testing.T) {
+	a := New(lg, version)
+	result := a.LoggedOnUser()
+	if result == "" {
+		t.Errorf("Could not get logged on user.")
+	}
+
+	t.Logf("Result: %s", result)
+}
+

agent/install_test.go

@@ -1,50 +1,42 @@
 package agent
 
 import (
-	"testing"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
+	"testing"
 )
 
-
-
 func TestInstall(t *testing.T) {
 	testTable := []struct {
 		name          string
 		expectedError error
 		version       string
+		log           logrus.Logger
 	}{
 		{
 			name:          "Install",
 			expectedError: nil,
 			version:       "2.0.4",
+			log:           *logrus.New(),
 		},
 		{
 			name:          "Install Error",
 			expectedError: nil,
 			version:       "bad ver",
+			log:           *logrus.New(),
 		},
 	}
 
 	for _, tt := range testTable {
 		t.Run(tt.name, func(t *testing.T) {
-			
+			a := New(&tt.log, tt.version)
-		})
-	}
-
-	var (
-		version = "2.0.4"
-		log     = logrus.New()
-	)
-
-	a := New(log, version)
 
 			viper.SetConfigName("testargs.json")
 			viper.SetConfigType("json")
 			viper.AddConfigPath(".")
 			viper.ReadInConfig()
 
-	installer := Installer {
+			installer := Installer{
 				RMM:         viper.GetString("api"),
 				ClientID:    viper.GetInt("clientid"),
 				SiteID:      viper.GetInt("siteid"),
@@ -65,4 +57,6 @@ func TestInstall(t *testing.T) {
 			}
 
 			a.Install(&installer)
+		})
+	}
 }