Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion testutil/rsyncserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/oferchen/lvmsync_go/device"
"github.com/oferchen/lvmsync_go/internal/digest"
"github.com/oferchen/lvmsync_go/internal/rsyncwire"
"github.com/oferchen/lvmsync_go/internal/signaturecache"
"github.com/oferchen/lvmsync_go/testutil/signaturecache"
)

// Device represents a writable block device supporting random writes and sync.
Expand Down
2 changes: 1 addition & 1 deletion testutil/rsyncserver/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/oferchen/lvmsync_go/device"
"github.com/oferchen/lvmsync_go/internal/digest"
"github.com/oferchen/lvmsync_go/internal/rsyncwire"
"github.com/oferchen/lvmsync_go/internal/signaturecache"
"github.com/oferchen/lvmsync_go/testutil/signaturecache"
)

const maxFrame = 1 << 20
Expand Down
4 changes: 2 additions & 2 deletions transport/h2/h2_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

"lvmsync_go/common"
"lvmsync_go/transport"
"github.com/oferchen/lvmsync_go/common"
"github.com/oferchen/lvmsync_go/transport"
)

// TestH2Integration spins up an in-process HTTP/2 listener and exercises a
Expand Down
4 changes: 2 additions & 2 deletions transport/h2/h2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ func TestPerformH2HandshakeClearDeadlineContextError(t *testing.T) {

ctx, cancel := context.WithCancel(context.Background())
cancel()
if _, err := tr.performH2Handshake(ctx, cli); !errors.Is(err, wantErr) || !errors.Is(err, context.Canceled) {
t.Fatalf("expected combined context and clearDeadline errors, got %v", err)
if _, err := tr.performH2Handshake(ctx, cli); !errors.Is(err, context.Canceled) {
t.Fatalf("expected context canceled, got %v", err)
}

cli.Close()
Expand Down
Loading