From a57e2b358f4c7a8bba302148e729cd980d4621b5 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 23 Feb 2014 13:58:10 +0100 Subject: [PATCH] Fix tests --- model_test.go | 9 ++++++--- protocol/common_test.go | 6 ++---- protocol/protocol.go | 2 +- protocol/protocol_test.go | 8 ++++---- walk.go | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/model_test.go b/model_test.go index 43909f59b..8be7cfe68 100644 --- a/model_test.go +++ b/model_test.go @@ -32,18 +32,21 @@ var testDataExpected = map[string]File{ Name: "foo", Flags: 0, Modified: 0, + Size: 7, Blocks: []Block{{Offset: 0x0, Size: 0x7, Hash: []uint8{0xae, 0xc0, 0x70, 0x64, 0x5f, 0xe5, 0x3e, 0xe3, 0xb3, 0x76, 0x30, 0x59, 0x37, 0x61, 0x34, 0xf0, 0x58, 0xcc, 0x33, 0x72, 0x47, 0xc9, 0x78, 0xad, 0xd1, 0x78, 0xb6, 0xcc, 0xdf, 0xb0, 0x1, 0x9f}}}, }, "empty": File{ Name: "empty", Flags: 0, Modified: 0, + Size: 0, Blocks: []Block{{Offset: 0x0, Size: 0x0, Hash: []uint8{0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55}}}, }, "bar": File{ Name: "bar", Flags: 0, Modified: 0, + Size: 10, Blocks: []Block{{Offset: 0x0, Size: 0xa, Hash: []uint8{0x2f, 0x72, 0xcc, 0x11, 0xa6, 0xfc, 0xd0, 0x27, 0x1e, 0xce, 0xf8, 0xc6, 0x10, 0x56, 0xee, 0x1e, 0xb1, 0x24, 0x3b, 0xe3, 0x80, 0x5b, 0xf9, 0xa9, 0xdf, 0x98, 0xf9, 0x2f, 0x76, 0x36, 0xb0, 0x5c}}}, }, } @@ -345,7 +348,7 @@ func TestRequest(t *testing.T) { fs, _ := m.Walk(false) m.ReplaceLocal(fs) - bs, err := m.Request("some node", "default", "foo", 0, 6, nil) + bs, err := m.Request("some node", "default", "foo", 0, 6) if err != nil { t.Fatal(err) } @@ -353,7 +356,7 @@ func TestRequest(t *testing.T) { t.Errorf("Incorrect data from request: %q", string(bs)) } - bs, err = m.Request("some node", "default", "../walk.go", 0, 6, nil) + bs, err = m.Request("some node", "default", "../walk.go", 0, 6) if err == nil { t.Error("Unexpected nil error on insecure file read") } @@ -489,7 +492,7 @@ func (f FakeConnection) Option(string) string { func (FakeConnection) Index(string, []protocol.FileInfo) {} -func (f FakeConnection) Request(repo, name string, offset int64, size uint32, hash []byte) ([]byte, error) { +func (f FakeConnection) Request(repo, name string, offset int64, size int) ([]byte, error) { return f.requestData, nil } diff --git a/protocol/common_test.go b/protocol/common_test.go index 9a1b0e457..8912fc946 100644 --- a/protocol/common_test.go +++ b/protocol/common_test.go @@ -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 } diff --git a/protocol/protocol.go b/protocol/protocol.go index ffae03897..9fca8f884 100644 --- a/protocol/protocol.go +++ b/protocol/protocol.go @@ -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()) diff --git a/protocol/protocol_test.go b/protocol/protocol_test.go index 595083474..f15a6773a 100644 --- a/protocol/protocol_test.go +++ b/protocol/protocol_test.go @@ -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") } diff --git a/walk.go b/walk.go index 719e16174..3f4c35c57 100644 --- a/walk.go +++ b/walk.go @@ -26,8 +26,8 @@ type File struct { } func (f File) String() string { - return fmt.Sprintf("File{Name:%q, Flags:0x%x, Modified:%d, Version:%d, NumBlocks:%d}", - f.Name, f.Flags, f.Modified, f.Version, len(f.Blocks)) + return fmt.Sprintf("File{Name:%q, Flags:0x%x, Modified:%d, Version:%d, Size:%d, NumBlocks:%d}", + f.Name, f.Flags, f.Modified, f.Version, f.Size, len(f.Blocks)) } func (f File) Equals(o File) bool {