178b9d569d5c943c2ab589e76aa4c29238c61785

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

Message

fix(daemon): tests after upgrading go-git

Diff

 1diff --git a/pkg/daemon/daemon_test.go b/pkg/daemon/daemon_test.go
 2index a8710513eedbe3db6a3f40fd41efce599ddbd2cf..40e0e102535de2dccc7008b1a505eaac5b605971 100644
 3--- a/pkg/daemon/daemon_test.go
 4+++ b/pkg/daemon/daemon_test.go
 5@@ -3,7 +3,6 @@ package daemon
 6 import (
 7 	"bytes"
 8 	"context"
 9-	"errors"
10 	"fmt"
11 	"io"
12 	"log"
13@@ -81,12 +80,9 @@ func TestIdleTimeout(t *testing.T) {
14 	if err != nil {
15 		t.Fatal(err)
16 	}
17-	out, err := readPktline(c)
18-	if err != nil && !errors.Is(err, io.EOF) {
19-		t.Fatalf("expected nil, got error: %v", err)
20-	}
21-	if out != "ERR "+git.ErrTimeout.Error() && out != "" {
22-		t.Fatalf("expected %q error, got %q", git.ErrTimeout, out)
23+	_, err = readPktline(c)
24+	if err != nil && err.Error() != git.ErrTimeout.Error() {
25+		t.Fatalf("expected %q error, got %q", git.ErrTimeout, err)
26 	}
27 }
28 
29@@ -98,12 +94,9 @@ func TestInvalidRepo(t *testing.T) {
30 	if err := pktline.NewEncoder(c).EncodeString("git-upload-pack /test.git\x00"); err != nil {
31 		t.Fatalf("expected nil, got error: %v", err)
32 	}
33-	out, err := readPktline(c)
34-	if err != nil {
35-		t.Fatalf("expected nil, got error: %v", err)
36-	}
37-	if out != "ERR "+git.ErrInvalidRepo.Error() {
38-		t.Fatalf("expected %q error, got %q", git.ErrInvalidRepo, out)
39+	_, err = readPktline(c)
40+	if err != nil && err.Error() != git.ErrInvalidRepo.Error() {
41+		t.Fatalf("expected %q error, got %q", git.ErrInvalidRepo, err)
42 	}
43 }
44