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/dtail_test.go | 1 -
 1 file changed, 1 deletion(-)

(limited to 'integrationtests/dtail_test.go')

diff --git a/integrationtests/dtail_test.go b/integrationtests/dtail_test.go
index c6d0107..2b4d6de 100644
--- a/integrationtests/dtail_test.go
+++ b/integrationtests/dtail_test.go
@@ -45,7 +45,6 @@ func TestDTailWithServer(t *testing.T) {
 		return
 	}
 
-	// TODO: In testmode, the client should not try to manipulate any known_hosts files.
 	// TODO: In testmode, never read a config file (use none for all commands)
 	clientCh, _, _, err := startCommand(ctx, t,
 		"../dtail",
-- 
cgit v1.2.3


From 14959ffba46282dd7b8ada53db0dfc0e1b26ab2e Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 24 Oct 2021 13:34:06 +0300
Subject: Fix DCat color test.

---
 integrationtests/dtail_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'integrationtests/dtail_test.go')

diff --git a/integrationtests/dtail_test.go b/integrationtests/dtail_test.go
index 2b4d6de..56008df 100644
--- a/integrationtests/dtail_test.go
+++ b/integrationtests/dtail_test.go
@@ -45,7 +45,7 @@ func TestDTailWithServer(t *testing.T) {
 		return
 	}
 
-	// TODO: In testmode, never read a config file (use none for all commands)
+	// MAYBETODO: In testmode, never read a config file (use none for all commands)
 	clientCh, _, _, err := startCommand(ctx, t,
 		"../dtail",
 		"--logger", "stdout",
-- 
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/dtail_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'integrationtests/dtail_test.go')

diff --git a/integrationtests/dtail_test.go b/integrationtests/dtail_test.go
index 56008df..6814c42 100644
--- a/integrationtests/dtail_test.go
+++ b/integrationtests/dtail_test.go
@@ -34,8 +34,9 @@ func TestDTailWithServer(t *testing.T) {
 
 	serverCh, _, _, err := startCommand(ctx, t,
 		"../dserver",
+		"--cfg", "none",
 		"--logger", "stdout",
-		"--logLevel", "trace",
+		"--logLevel", "info",
 		"--bindAddress", "localhost",
 		"--port", "4243",
 		"--relaxedAuth",
@@ -48,8 +49,9 @@ func TestDTailWithServer(t *testing.T) {
 	// MAYBETODO: In testmode, never read a config file (use none for all commands)
 	clientCh, _, _, err := startCommand(ctx, t,
 		"../dtail",
+		"--cfg", "none",
 		"--logger", "stdout",
-		"--logLevel", "trace",
+		"--logLevel", "info",
 		"--servers", "localhost:4243",
 		"--files", followFile,
 		"--grep", "Hello",
-- 
cgit v1.2.3


From 6cfc4e161f94ab159d4b1ea491ffe6f166fa6204 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 24 Oct 2021 14:06:11 +0300
Subject: Integration tests can run concurrently, so we now have unique TCP
 ports for each

---
 integrationtests/dtail_test.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'integrationtests/dtail_test.go')

diff --git a/integrationtests/dtail_test.go b/integrationtests/dtail_test.go
index 6814c42..e9cf257 100644
--- a/integrationtests/dtail_test.go
+++ b/integrationtests/dtail_test.go
@@ -17,7 +17,9 @@ func TestDTailWithServer(t *testing.T) {
 		return
 	}
 	followFile := "dtail.follow.tmp"
-	greetings := []string{"world!", "sol-system!", "milky-way!", "universe!", "multiverse!"}
+	port := getUniquePortNumber()
+	bindAddress := "localhost"
+	greetings := []string{"World!", "Sol-System!", "Milky-Way!", "Universe!", "Multiverse!"}
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -37,8 +39,8 @@ func TestDTailWithServer(t *testing.T) {
 		"--cfg", "none",
 		"--logger", "stdout",
 		"--logLevel", "info",
-		"--bindAddress", "localhost",
-		"--port", "4243",
+		"--bindAddress", bindAddress,
+		"--port", fmt.Sprintf("%d", port),
 		"--relaxedAuth",
 	)
 	if err != nil {
@@ -52,7 +54,7 @@ func TestDTailWithServer(t *testing.T) {
 		"--cfg", "none",
 		"--logger", "stdout",
 		"--logLevel", "info",
-		"--servers", "localhost:4243",
+		"--servers", fmt.Sprintf("%s:%d", bindAddress, port),
 		"--files", followFile,
 		"--grep", "Hello",
 		"--trustAllHosts",
-- 
cgit v1.2.3