Skip to content

Commit

Permalink
fix(daemon): tests after upgrading go-git
Browse files Browse the repository at this point in the history
aymanbagabas committed Nov 28, 2023
1 parent 0ec24e3 commit 178b9d5
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions pkg/daemon/daemon_test.go
Original file line number Diff line number Diff line change
@@ -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)
}
}

0 comments on commit 178b9d5

Please sign in to comment.