e93eeff8f3c56bc25d8dfcaad23604fa7dea9f96

Author
Ayman Bagabas <ayman.bagabas@gmail.com>
Committer
Ayman Bagabas <ayman.bagabas@gmail.com>
Date

Message

fix(daemon): ensure daemon starts correctly in tests and ignore errors

Diff

 1diff --git a/pkg/daemon/daemon_test.go b/pkg/daemon/daemon_test.go
 2index b9cb77c6444707971ef47be9e09b80b2f7e689c4..8326e3023f988323610f5a8c8219fcec33915cfb 100644
 3--- a/pkg/daemon/daemon_test.go
 4+++ b/pkg/daemon/daemon_test.go
 5@@ -58,11 +58,7 @@ func TestMain(m *testing.M) {
 6 		log.Fatal(err)
 7 	}
 8 	testDaemon = d
 9-	go func() {
10-		if err := d.ListenAndServe(); err != ErrServerClosed {
11-			log.Fatal(err)
12-		}
13-	}()
14+	go d.ListenAndServe() //nolint:errcheck
15 	code := m.Run()
16 	os.Unsetenv("SOFT_SERVE_DATA_PATH")
17 	os.Unsetenv("SOFT_SERVE_GIT_MAX_CONNECTIONS")
18@@ -81,7 +77,7 @@ func TestIdleTimeout(t *testing.T) {
19 	for {
20 		c, err = net.Dial("tcp", testDaemon.addr)
21 		if err != nil && tries >= 3 {
22-			t.Fatal(err)
23+			t.Fatalf("failed to connect to daemon after %d tries: %v", tries, err)
24 		}
25 		tries++
26 		if testDaemon.conns.Size() != 0 {
27@@ -99,7 +95,7 @@ func TestIdleTimeout(t *testing.T) {
28 func TestInvalidRepo(t *testing.T) {
29 	c, err := net.Dial("tcp", testDaemon.addr)
30 	if err != nil {
31-		t.Fatal(err)
32+		t.Fatalf("failed to connect to daemon: %v", err)
33 	}
34 	if err := pktline.NewEncoder(c).EncodeString("git-upload-pack /test.git\x00"); err != nil {
35 		t.Fatalf("expected nil, got error: %v", err)