update yugabyte_test.go

Signed-off-by: Sameer Kulkarni <[email protected]>

Author: samkulkarni20

test/yugabyte_test.go

@@ -3,7 +3,6 @@ package yugabyte
 import (
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -71,10 +70,12 @@ func TestYugaByteGcpTerraform(t *testing.T) {
 			testYugaByteYSQLSH(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP)
 			testYugaByteCQLSH(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP)
 			testYugaByteConf(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, yugabyteDir)
-			testYugaByteMasterProcess(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP)
-			testYugaByteTserverProcess(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP)
-			testYugaByteMasterLog(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP)
-			testYugaByteTserverLog(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP)
+			testYugaByteProcess(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, "yb-master")
+			testYugaByteProcess(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, "yb-tserver")
+			testYugaByteLogFile(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, "master.out", "master")
+			testYugaByteLogFile(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, "master.err", "master")
+			testYugaByteLogFile(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, "tserver.out", "tserver")
+			testYugaByteLogFile(t, terraformOptions, maxRetries, timeBetweenRetries, keyPair, publicIP, "tserver.err", "tserver")
 
 		}
 
@@ -145,37 +146,6 @@ func testYugaByteSSH(t *testing.T, terraformOptions *terraform.Options, maxRetri
 
 }
 
-func testYugaByteDirectory(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration, keyPair *ssh.KeyPair, publicIP string) {
-
-	RemoteDir := filepath.Join("/home/", sshUser)
-	commandListDirectory := "ls -1 " + RemoteDir
-	testFile := filepath.Join(yugabyteDir, "/test/DirectoryList")
-	logger.Logf(t, "testFile :- %s", testFile)
-	assert.FileExists(t, testFile)
-
-	sshHost := ssh.Host{
-		Hostname:    string(publicIP),
-		SshKeyPair:  keyPair,
-		SshUserName: sshUser,
-	}
-
-	file, err := ioutil.ReadFile(testFile)
-	if err != nil {
-		fmt.Print(err)
-	}
-
-	retry.DoWithRetry(t, "Listing Directory", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, commandListDirectory)
-		if err != nil {
-			return "", err
-		}
-		logger.Logf(t, "Directory list :- %s", output)
-
-		assert.Equal(t, strings.TrimSpace(output), strings.TrimSpace(string(file)))
-		return output, nil
-	})
-}
-
 func testYugaByteYSQLSH(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration, keyPair *ssh.KeyPair, publicIP string) {
 
 	commandConnectYSQLSH := "cd " + filepath.Join("/home/", sshUser, "/yugabyte-db/tserver") + " && ./bin/ysqlsh  --echo-queries -h " + string(publicIP)
@@ -239,115 +209,42 @@ func testYugaByteConf(t *testing.T, terraformOptions *terraform.Options, maxRetr
 	assert.FileExists(t, filepath.Join(yugabyteDir, "/server.conf"))
 }
 
-func testYugaByteMasterProcess(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration, keyPair *ssh.KeyPair, publicIP string) {
-
+func testYugaByteProcess(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration,  keyPair *ssh.KeyPair, publicIP string, processName string) {
 	sshHost := ssh.Host{
 		Hostname:    string(publicIP),
 		SshKeyPair:  keyPair,
 		SshUserName: sshUser,
 	}
-	sampleText := "yb-master"
-	retry.DoWithRetry(t, "Checking master process", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("pgrep --list-name yb-master"))
+	retry.DoWithRetry(t, "Checking process "+processName, maxRetries, timeBetweenRetries, func() (string, error) {
+		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("pgrep --list-name '%s'", processName))
 		if err != nil {
 			return "", err
 		}
-		if ! strings.Contains(output, sampleText) {
-			return "", fmt.Errorf("Expected: %s. Got: %s\n", sampleText, output)
+		if ! strings.Contains(output, processName) {
+			return "", fmt.Errorf("Expected: %s. Got: %s\n", processName, output)
 		}
 		return "", nil
 	})
 
 }
 
-func testYugaByteTserverProcess(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration, keyPair *ssh.KeyPair, publicIP string) {
-
+func testYugaByteLogFile(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration,  keyPair *ssh.KeyPair, publicIP string, logFile string, logDir string) {
+	RemoteDir:= filepath.Join("/home", sshUser, "yugabyte-db", logDir)
 	sshHost := ssh.Host{
 		Hostname:    string(publicIP),
 		SshKeyPair:  keyPair,
 		SshUserName: sshUser,
 	}
-	sampleText := "yb-tserver"
-	retry.DoWithRetry(t, "Checkng tserver process", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("pgrep --list-name yb-tserver"))
+	
+	retry.DoWithRetry(t, "Checking log file "+logFile, maxRetries, timeBetweenRetries, func() (string, error) {
+		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("ls '%s' | grep '%s'",RemoteDir, logFile))
 		if err != nil {
 			return "", err
 		}
-		if ! strings.Contains(output, sampleText) {
-			return "", fmt.Errorf("Expected: %s. Got: %s\n", sampleText, output)
-		}
-		return "", nil
-	})
-
-}
-
-func testYugaByteMasterLog(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration, keyPair *ssh.KeyPair, publicIP string) {
-	RemoteDir:= filepath.Join("/home/", sshUser, "/yugabyte-db/master")
-	sshHost := ssh.Host{
-		Hostname:    string(publicIP),
-		SshKeyPair:  keyPair,
-		SshUserName: sshUser,
-	}
-	//Checking master.out
-	sampleText := "master.out"
-	retry.DoWithRetry(t, "Checking master log file master.out", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("ls %s | grep master.out",RemoteDir))
-		if err != nil {
-			return "", err
-		}
-		if strings.TrimSpace(sampleText) != strings.TrimSpace(output) {
-			return "", fmt.Errorf("Expected: %s. Got: %s\n", sampleText, output)
+		if strings.TrimSpace(logFile) != strings.TrimSpace(output) {
+			return "", fmt.Errorf("Expected: %s. Got: %s\n", logFile, output)
 		}
 		return "", nil
 	})
 
-	//checking master.err
-	sampleText = "master.err"
-	retry.DoWithRetry(t, "Checking master log file master.err", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("ls %s | grep master.err",RemoteDir))
-		if err != nil {
-			return "", err
-		}
-		if strings.TrimSpace(sampleText) != strings.TrimSpace(output) {
-			return "", fmt.Errorf("Expected: %s. Got: %s\n", sampleText, output)
-		}
-		return "", nil
-	})
-
-}
-
-func testYugaByteTserverLog(t *testing.T, terraformOptions *terraform.Options, maxRetries int, timeBetweenRetries time.Duration, keyPair *ssh.KeyPair, publicIP string) {
-
-	RemoteDir:= filepath.Join("/home/", sshUser, "/yugabyte-db/tserver")
-	sshHost := ssh.Host{
-		Hostname:    string(publicIP),
-		SshKeyPair:  keyPair,
-		SshUserName: sshUser,
-	}
-	sampleText := "tserver.out"
-	retry.DoWithRetry(t, "Checking tserver log file tserver.out", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("ls %s | grep tserver.out",RemoteDir))
-		if err != nil {
-			return "", err
-		}
-		if strings.TrimSpace(sampleText) != strings.TrimSpace(output) {
-			return "", fmt.Errorf("Expected: %s. Got: %s\n", sampleText, output)
-		}
-		return "", nil
-	})
-
-	sampleText = "tserver.err"
-	retry.DoWithRetry(t, "Checking tserver log file tserver.err", maxRetries, timeBetweenRetries, func() (string, error) {
-		output, err := ssh.CheckSshCommandE(t, sshHost, fmt.Sprintf("ls %s | grep tserver.err", RemoteDir))
-		if err != nil {
-			return "", err
-		}
-		if strings.TrimSpace(sampleText) != strings.TrimSpace(output) {
-			return "", fmt.Errorf("Expected: %s. Got: %s\n", sampleText, output)
-		}
-		return "", nil
-	})
-
-}
-
-
+}