[fix] fixed failing ssh tests

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

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/driver/ssh.go b/driver/ssh.go
@@ -109,18 +109,18 @@ func (d *SSH) GetDetails() SystemDetails {
 			windowsName, err := d.RunCommand(`systeminfo | findstr /R /C:Windows`)
 			if err == nil {
 				if strings.Contains(strings.ToLower(windowsName), "windows") {
-					uname = "windows"
+					uname = "Windows"
 				}
 			}
 		}
 		details := &SystemDetails{}
-		details.Name = uname
+		details.Name = strings.TrimSpace(strings.Trim(uname, "\n"))
 		switch details.Name {
-		case "windows":
+		case "Windows":
 			details.IsWindows = true
-		case "linux":
+		case "Linux":
 			details.IsLinux = true
-		case "darwin":
+		case "Darwin":
 			details.IsDarwin = true
 		}
 		d.Info = details

diff --git a/driver/ssh_test.go b/driver/ssh_test.go
@@ -38,6 +38,6 @@ func TestSSHSystemDetails(t *testing.T) {
 	d := NewSSHForTest()
 	details := d.GetDetails()
 	if !details.IsLinux {
-		t.Errorf("Expected linux server for ssh test got %s", details.Name)
+		t.Errorf("Expected linux server for ssh test got %#v", details)
 	}
 }
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -2,6 +2,8 @@ package integration
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -18,12 +20,16 @@ func NewWebForTest() driver.Driver {
 }
 
 func NewSSHForTest() driver.Driver {
-	_ = config.GetConfig()
+	workingDir, _ := os.Getwd()
+	workingDir = filepath.Dir(workingDir)
+	yamlPath := fmt.Sprintf("%s/%s", workingDir, "config-test.yaml")
+	conf := config.LoadConfig(yamlPath)
+	dashboardInfo := config.GetDashboardInfoConfig(conf)
 	return &driver.SSH{
-		User:            "dev",
-		Host:            "127.0.0.1",
-		Port:            2222,
-		KeyFile:         "/home/diretnan/.ssh/id_rsa",
+		User:            dashboardInfo.Hosts[0].Connection.Username,
+		Host:            dashboardInfo.Hosts[0].Address,
+		Port:            int(dashboardInfo.Hosts[0].Connection.Port),
+		KeyFile:         dashboardInfo.Hosts[0].Connection.PrivateKeyPath,
 		KeyPass:         "",
 		CheckKnownHosts: false,
 	}

diff --git a/scripts/prep-test-ssh.sh b/scripts/prep-test-ssh.sh
@@ -13,7 +13,7 @@ SSH_HOST="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" saido-linux-ssh
 cat <<EOF > config-test.yaml
 hosts:
   children:
-    "${SSH_HOST}":
+    "0.0.0.0":
       connection:
         type: ssh
         username: ${SSH_USER}