Fixed & improved tests

Author: ewoutp

test/process_cluster_diff_logdir_test.go

@@ -68,6 +68,64 @@ func TestProcessClusterDifferentLogDir(t *testing.T) {
 		testCluster(t, insecureStarterEndpoint(2*portIncrement), false)
 	}
 
+	check := func(rootDir string, expectedFileCount int) {
+		files, err := getRecursiveLogFiles(rootDir)
+		if err != nil {
+			t.Errorf("Failed to get log files in %s: %v", rootDir, err)
+		} else if len(files) != expectedFileCount {
+			t.Errorf("Expected %d log files in %s, got %d (%v)", expectedFileCount, rootDir, len(files), files)
+		}
+	}
+	check(dataDirMaster, 0)
+	check(dataDirSlave1, 0)
+	check(dataDirSlave2, 0)
+	check(masterLogDir, 3+1) // +1 == arangodb.log (starter log)
+	check(slave1LogDir, 3+1)
+	check(slave2LogDir, 3+1)
+
+	if isVerbose {
+		t.Log("Waiting for termination")
+	}
+	SendIntrAndWait(t, master, slave1, slave2)
+}
+
+func TestProcessClusterDifferentLogDirNoLog2File(t *testing.T) {
+	removeArangodProcesses(t)
+	needTestMode(t, testModeProcess)
+	needStarterMode(t, starterModeCluster)
+	dataDirMaster := SetUniqueDataDir(t)
+	defer os.RemoveAll(dataDirMaster)
+
+	start := time.Now()
+
+	logDir, err := ioutil.TempDir("", "")
+	if err != nil {
+		t.Fatalf("TempDir failed: %v", err)
+	}
+
+	masterLogDir := filepath.Join(logDir, "master")
+	master := Spawn(t, "${STARTER} --log.file=false --log.dir="+masterLogDir+" "+createEnvironmentStarterOptions())
+	defer master.Close()
+
+	slave1LogDir := filepath.Join(logDir, "slave1")
+	dataDirSlave1 := SetUniqueDataDir(t)
+	defer os.RemoveAll(dataDirSlave1)
+	slave1 := Spawn(t, "${STARTER} --log.file=false --starter.join 127.0.0.1 --log.dir="+slave1LogDir+" "+createEnvironmentStarterOptions())
+	defer slave1.Close()
+
+	slave2LogDir := filepath.Join(logDir, "slave2")
+	dataDirSlave2 := SetUniqueDataDir(t)
+	defer os.RemoveAll(dataDirSlave2)
+	slave2 := Spawn(t, "${STARTER} --log.file=false --starter.join 127.0.0.1 --log.dir="+slave2LogDir+" "+createEnvironmentStarterOptions())
+	defer slave2.Close()
+
+	if ok := WaitUntilStarterReady(t, whatCluster, 3, master, slave1, slave2); ok {
+		t.Logf("Cluster start took %s", time.Since(start))
+		testCluster(t, insecureStarterEndpoint(0*portIncrement), false)
+		testCluster(t, insecureStarterEndpoint(1*portIncrement), false)
+		testCluster(t, insecureStarterEndpoint(2*portIncrement), false)
+	}
+
 	check := func(rootDir string, expectedFileCount int) {
 		files, err := getRecursiveLogFiles(rootDir)
 		if err != nil {