From ac2d6fa5d054ca725a7268eb1a8e050525372c34 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 24 Oct 2021 12:59:08 +0300
Subject: Fix deadlock around aggregating data + server max concurrent file
 read limiter

---
 integrationtests/dmap_test.go | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

(limited to 'integrationtests/dmap_test.go')

diff --git a/integrationtests/dmap_test.go b/integrationtests/dmap_test.go
index 7d8b8b5..2de679b 100644
--- a/integrationtests/dmap_test.go
+++ b/integrationtests/dmap_test.go
@@ -15,7 +15,6 @@ func TestDMap(t *testing.T) {
 		return
 	}
 	inFile := "mapr_testdata.log"
-	stdoutFile := "dmap.stdout.tmp"
 	csvFile := "dmap.csv.tmp"
 	expectedCsvFile := "dmap.csv.expected"
 	queryFile := fmt.Sprintf("%s.query", csvFile)
@@ -25,14 +24,23 @@ func TestDMap(t *testing.T) {
 		"avg($goroutines),min(concurrentConnections),max(lifetimeConnections) "+
 		"group by $hostname outfile %s", csvFile)
 
-	_, err := runCommand(context.TODO(), t, stdoutFile,
-		"../dmap", "--query", query, inFile)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	stdoutCh, stderrCh, cmdErrCh, err := startCommand(ctx, t, "../dmap",
+		"--query", query,
+		"--logger", "stdout",
+		"--logLevel", "error",
+		"--noColor",
+		inFile)
 
 	if err != nil {
 		t.Error(err)
 		return
 	}
 
+	waitForCommand(ctx, t, stdoutCh, stderrCh, cmdErrCh)
+
 	if err := compareFiles(t, csvFile, expectedCsvFile); err != nil {
 		t.Error(err)
 		return
@@ -42,7 +50,6 @@ func TestDMap(t *testing.T) {
 		return
 	}
 
-	os.Remove(stdoutFile)
 	os.Remove(csvFile)
 	os.Remove(queryFile)
 }
@@ -100,16 +107,31 @@ func TestDMap3(t *testing.T) {
 		"avg($goroutines),min($goroutines) group by $time order by count($time) "+
 		"outfile %s", csvFile)
 
-	// Read many input files at once.
-	args := []string{"--logLevel", "trace", "--pprof", "localhost:8080", "--query", query}
-	for i := 0; i < 100; i++ {
-		args = append(args, inFile)
-	}
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	stdoutCh, stderrCh, cmdErrCh, err := startCommand(ctx, t, "../dmap",
+		"--query", query,
+		"--logger", "stdout",
+		"--logLevel", "info",
+		"--noColor",
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile,
+		inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile, inFile)
 
-	if _, err := runCommand(context.TODO(), t, stdoutFile, "../dmap", args...); err != nil {
+	if err != nil {
 		t.Error(err)
 		return
 	}
+	waitForCommand(ctx, t, stdoutCh, stderrCh, cmdErrCh)
+
 	if err := compareFilesContents(t, csvFile, expectedCsvFile); err != nil {
 		t.Error(err)
 		return
-- 
cgit v1.2.3


From 87b6c47999f49c2deff42fdcc703c419b251bdbc Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 24 Oct 2021 13:44:06 +0300
Subject: integration tests use a different known_hosts path and also dont read
 any external config files

---
 integrationtests/dmap_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'integrationtests/dmap_test.go')

diff --git a/integrationtests/dmap_test.go b/integrationtests/dmap_test.go
index 2de679b..53b8574 100644
--- a/integrationtests/dmap_test.go
+++ b/integrationtests/dmap_test.go
@@ -28,6 +28,7 @@ func TestDMap(t *testing.T) {
 	defer cancel()
 
 	stdoutCh, stderrCh, cmdErrCh, err := startCommand(ctx, t, "../dmap",
+		"--cfg", "none",
 		"--query", query,
 		"--logger", "stdout",
 		"--logLevel", "error",
@@ -71,7 +72,7 @@ func TestDMap2(t *testing.T) {
 		"outfile %s", csvFile)
 
 	_, err := runCommand(context.TODO(), t, stdoutFile,
-		"../dmap", "--query", query, inFile)
+		"../dmap", "--query", query, "--cfg", "none", inFile)
 	if err != nil {
 		t.Error(err)
 		return
@@ -112,6 +113,7 @@ func TestDMap3(t *testing.T) {
 
 	stdoutCh, stderrCh, cmdErrCh, err := startCommand(ctx, t, "../dmap",
 		"--query", query,
+		"--cfg", "none",
 		"--logger", "stdout",
 		"--logLevel", "info",
 		"--noColor",
-- 
cgit v1.2.3