From 178b9d569d5c943c2ab589e76aa4c29238c61785 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Tue, 28 Nov 2023 17:10:50 -0500 Subject: [PATCH] fix(daemon): tests after upgrading go-git --- pkg/daemon/daemon_test.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkg/daemon/daemon_test.go b/pkg/daemon/daemon_test.go index a8710513eedbe3db6a3f40fd41efce599ddbd2cf..40e0e102535de2dccc7008b1a505eaac5b605971 100644 --- a/pkg/daemon/daemon_test.go +++ b/pkg/daemon/daemon_test.go @@ -3,7 +3,6 @@ package daemon import ( "bytes" "context" - "errors" "fmt" "io" "log" @@ -81,12 +80,9 @@ func TestIdleTimeout(t *testing.T) { if err != nil { t.Fatal(err) } - out, err := readPktline(c) - if err != nil && !errors.Is(err, io.EOF) { - t.Fatalf("expected nil, got error: %v", err) - } - if out != "ERR "+git.ErrTimeout.Error() && out != "" { - t.Fatalf("expected %q error, got %q", git.ErrTimeout, out) + _, err = readPktline(c) + if err != nil && err.Error() != git.ErrTimeout.Error() { + t.Fatalf("expected %q error, got %q", git.ErrTimeout, err) } } @@ -98,12 +94,9 @@ func TestInvalidRepo(t *testing.T) { if err := pktline.NewEncoder(c).EncodeString("git-upload-pack /test.git\x00"); err != nil { t.Fatalf("expected nil, got error: %v", err) } - out, err := readPktline(c) - if err != nil { - t.Fatalf("expected nil, got error: %v", err) - } - if out != "ERR "+git.ErrInvalidRepo.Error() { - t.Fatalf("expected %q error, got %q", git.ErrInvalidRepo, out) + _, err = readPktline(c) + if err != nil && err.Error() != git.ErrInvalidRepo.Error() { + t.Fatalf("expected %q error, got %q", git.ErrInvalidRepo, err) } }