perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Jakob Borg
2014-02-23 13:58:10 +01:00
parent d0863d495c
commit a57e2b358f
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
protocol/common_test.go
View File

@@ -7,8 +7,7 @@ type TestModel struct {
repo string
name string
offset int64
size uint32
hash []byte
size int
closed bool
}
@@ -18,12 +17,11 @@ func (t *TestModel) Index(nodeID string, files []FileInfo) {
func (t *TestModel) IndexUpdate(nodeID string, files []FileInfo) {
}
func (t *TestModel) Request(nodeID, repo, name string, offset int64, size uint32, hash []byte) ([]byte, error) {
func (t *TestModel) Request(nodeID, repo, name string, offset int64, size int) ([]byte, error) {
t.repo = repo
t.name = name
t.offset = offset
t.size = size
t.hash = hash
return t.data, nil
}

2
protocol/protocol.go
View File

@@ -306,7 +306,7 @@ loop:
go c.processRequest(hdr.msgID, req)
case messageTypeResponse:
data := c.xr.ReadBytes()
data := c.xr.ReadBytesMax(256 * 1024) // Sufficiently larger than max expected block size
if c.xr.Error() != nil {
c.close(c.xr.Error())

8
protocol/protocol_test.go
View File

@@ -80,7 +80,7 @@ func TestRequestResponseErr(t *testing.T) {
NewConnection("c0", ar, ebw, m0, nil)
c1 := NewConnection("c1", br, eaw, m1, nil)
d, err := c1.Request("default", "tn", 1234)
d, err := c1.Request("default", "tn", 1234, 5678)
if err == e || err == ErrClosed {
t.Logf("Error at %d+%d bytes", i, j)
if !m1.closed {
@@ -104,10 +104,10 @@ func TestRequestResponseErr(t *testing.T) {
if m0.name != "tn" {
t.Error("Incorrect name %q", m0.name)
}
if m0.offset != 1234*BlockSize {
if m0.offset != 1234 {
t.Error("Incorrect offset %d", m0.offset)
}
if m0.size != BlockSize {
if m0.size != 5678 {
t.Error("Incorrect size %d", m0.size)
}
t.Logf("Pass at %d+%d bytes", i, j)
@@ -190,7 +190,7 @@ func TestClose(t *testing.T) {
c0.Index("default", nil)
c0.Index("default", nil)
_, err := c0.Request("default", "foo", 0)
_, err := c0.Request("default", "foo", 0, 0)
if err == nil {
t.Error("Request should return an error")
}