[fix] skip ssh tests for non-linux environments on Actions

bisohns · Mar 21, 2022 · ec8f9c0 · ec8f9c0
1 parent 36a4917
commit ec8f9c0
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 2 deletions.
diff --git a/driver/ssh_test.go b/driver/ssh_test.go
@@ -4,12 +4,22 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
 	"github.com/bisohns/saido/config"
 )
 
+func SkipNonLinuxOnCI() bool {
+	if os.Getenv("GITHUB_ACTIONS") == "true" {
+		if runtime.GOOS != "linux" {
+			return true
+		}
+	}
+	return false
+}
+
 func NewSSHForTest() Driver {
 	workingDir, _ := os.Getwd()
 	workingDir = filepath.Dir(workingDir)
@@ -27,6 +37,9 @@ func NewSSHForTest() Driver {
 }
 
 func TestSSHRunCommand(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	output, err := d.RunCommand(`ps -A`)
 	if err != nil || !strings.Contains(output, "PID") {
@@ -35,6 +48,9 @@ func TestSSHRunCommand(t *testing.T) {
 }
 
 func TestSSHSystemDetails(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	details := d.GetDetails()
 	if !details.IsLinux {

diff --git a/inspector/disk_test.go b/inspector/disk_test.go
@@ -6,12 +6,22 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 
 	"github.com/bisohns/saido/config"
 	"github.com/bisohns/saido/driver"
 )
 
+func SkipNonLinuxOnCI() bool {
+	if os.Getenv("GITHUB_ACTIONS") == "true" {
+		if runtime.GOOS != "linux" {
+			return true
+		}
+	}
+	return false
+}
+
 func NewSSHForTest() driver.Driver {
 	workingDir, _ := os.Getwd()
 	workingDir = filepath.Dir(workingDir)
@@ -39,6 +49,9 @@ func TestDFOnLocal(t *testing.T) {
 }
 
 func TestDFOnSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	driver := NewSSHForTest()
 	d, _ := NewDF(&driver)
 	d.Execute()

diff --git a/inspector/meminfo.go b/inspector/meminfo.go
@@ -224,8 +224,12 @@ func (i *MemInfoWin) Parse(output string) {
 			freeVirt, _ = strconv.ParseInt(fields[fieldLen-1], 0, 64)
 		case 5:
 			// Last line is L2 and L3 CacheSize
+			// sometimes L3 is not shown like on CI
+			var l3 int64 = 0
 			l2, _ := strconv.ParseInt(fields[0], 0, 64)
-			l3, _ := strconv.ParseInt(fields[1], 0, 64)
+			if fieldLen > 1 {
+				l3, _ = strconv.ParseInt(fields[1], 0, 64)
+			}
 			cachesize = l2 + l3
 
 		}

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -12,6 +13,15 @@ import (
 	"github.com/bisohns/saido/inspector"
 )
 
+func SkipNonLinuxOnCI() bool {
+	if os.Getenv("GITHUB_ACTIONS") == "true" {
+		if runtime.GOOS != "linux" {
+			return true
+		}
+	}
+	return false
+}
+
 func NewWebForTest() driver.Driver {
 	return &driver.Web{
 		URL:    "https://duckduckgo.com",
@@ -36,6 +46,9 @@ func NewSSHForTest() driver.Driver {
 }
 
 func TestDFonSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	i, _ := inspector.Init(`disk`, &d)
 	i.Execute()
@@ -46,6 +59,9 @@ func TestDFonSSH(t *testing.T) {
 }
 
 func TestMemInfoonSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	i, _ := inspector.NewMemInfo(&d)
 	i.Execute()
@@ -79,6 +95,9 @@ func TestResponseTimeonWeb(t *testing.T) {
 }
 
 func TestProcessonSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	i, _ := inspector.NewProcess(&d)
 	i.Execute()
@@ -97,6 +116,9 @@ func TestProcessonSSH(t *testing.T) {
 }
 
 func TestCustomonSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	// set vars
 	dfConcrete, _ := d.(*driver.SSH)
@@ -113,6 +135,9 @@ func TestCustomonSSH(t *testing.T) {
 }
 
 func TestLoadAvgonSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	i, _ := inspector.NewLoadAvg(&d)
 	i.Execute()
@@ -139,6 +164,9 @@ func TestCustomonWeb(t *testing.T) {
 }
 
 func TestUptimeonSSH(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewSSHForTest()
 	i, _ := inspector.NewUptime(&d)
 	i.Execute()

diff --git a/integration/integration_unix_test.go b/integration/integration_unix_test.go
@@ -49,6 +49,9 @@ func TestMemInfoonLocal(t *testing.T) {
 }
 
 func TestDockerStatsonLocal(t *testing.T) {
+	if SkipNonLinuxOnCI() {
+		return
+	}
 	d := NewLocalForTest()
 	i, _ := inspector.NewDockerStats(&d)
 	i.Execute()

diff --git a/integration/integration_windows_test.go b/integration/integration_windows_test.go
@@ -61,7 +61,7 @@ func TestLoadAverageonLocal(t *testing.T) {
 	i.Execute()
 	iConcrete, ok := i.(*inspector.LoadAvgWin)
 	if ok {
-		if iConcrete.Values.Load1M == 0 {
+		if iConcrete.Values.Load1M == 0 && !SkipNonLinuxOnCI() {
 			t.Error("Expected load on windows to be > 0")
 		}
 	}