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

Update Model function signatures

Browse Source
This commit is contained in:
Audrius Butkevicius
2015-01-14 22:11:31 +00:00
parent 941f637bca
commit 489e2e6ad5
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
internal/model/model_test.go
View File

@@ -94,7 +94,7 @@ func TestRequest(t *testing.T) {
m.ScanFolder("default")
// Existing, shared file
bs, err := m.Request(device1, "default", "foo", 0, 6)
bs, err := m.Request(device1, "default", "foo", 0, 6, nil, 0, nil)
if err != nil {
t.Error(err)
}
@@ -103,7 +103,7 @@ func TestRequest(t *testing.T) {
}
// Existing, nonshared file
bs, err = m.Request(device2, "default", "foo", 0, 6)
bs, err = m.Request(device2, "default", "foo", 0, 6, nil, 0, nil)
if err == nil {
t.Error("Unexpected nil error on insecure file read")
}
@@ -112,7 +112,7 @@ func TestRequest(t *testing.T) {
}
// Nonexistent file
bs, err = m.Request(device1, "default", "nonexistent", 0, 6)
bs, err = m.Request(device1, "default", "nonexistent", 0, 6, nil, 0, nil)
if err == nil {
t.Error("Unexpected nil error on insecure file read")
}
@@ -121,7 +121,7 @@ func TestRequest(t *testing.T) {
}
// Shared folder, but disallowed file name
bs, err = m.Request(device1, "default", "../walk.go", 0, 6)
bs, err = m.Request(device1, "default", "../walk.go", 0, 6, nil, 0, nil)
if err == nil {
t.Error("Unexpected nil error on insecure file read")
}
@@ -130,7 +130,7 @@ func TestRequest(t *testing.T) {
}
// Larger block than available
bs, err = m.Request(device1, "default", "foo", 0, 42)
bs, err = m.Request(device1, "default", "foo", 0, 42, nil, 0, nil)
if err == nil {
t.Error("Unexpected nil error on insecure file read")
}
@@ -139,7 +139,7 @@ func TestRequest(t *testing.T) {
}
// Negative offset
bs, err = m.Request(device1, "default", "foo", -4, 6)
bs, err = m.Request(device1, "default", "foo", -4, 6, nil, 0, nil)
if err == nil {
t.Error("Unexpected nil error on insecure file read")
}
@@ -148,7 +148,7 @@ func TestRequest(t *testing.T) {
}
// Negative size
bs, err = m.Request(device1, "default", "foo", 4, -4)
bs, err = m.Request(device1, "default", "foo", 4, -4, nil, 0, nil)
if err == nil {
t.Error("Unexpected nil error on insecure file read")
}
@@ -180,7 +180,7 @@ func BenchmarkIndex10000(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
}
}
@@ -193,7 +193,7 @@ func BenchmarkIndex00100(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
}
}
@@ -203,11 +203,11 @@ func BenchmarkIndexUpdate10000f10000(b *testing.B) {
m.AddFolder(defaultFolderConfig)
m.ScanFolder("default")
files := genFiles(10000)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
b.ResetTimer()
for i := 0; i < b.N; i++ {
m.IndexUpdate(device1, "default", files)
m.IndexUpdate(device1, "default", files, 0, nil)
}
}
@@ -217,12 +217,12 @@ func BenchmarkIndexUpdate10000f00100(b *testing.B) {
m.AddFolder(defaultFolderConfig)
m.ScanFolder("default")
files := genFiles(10000)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
ufiles := genFiles(100)
b.ResetTimer()
for i := 0; i < b.N; i++ {
m.IndexUpdate(device1, "default", ufiles)
m.IndexUpdate(device1, "default", ufiles, 0, nil)
}
}
@@ -232,12 +232,12 @@ func BenchmarkIndexUpdate10000f00001(b *testing.B) {
m.AddFolder(defaultFolderConfig)
m.ScanFolder("default")
files := genFiles(10000)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
ufiles := genFiles(1)
b.ResetTimer()
for i := 0; i < b.N; i++ {
m.IndexUpdate(device1, "default", ufiles)
m.IndexUpdate(device1, "default", ufiles, 0, nil)
}
}
@@ -262,15 +262,15 @@ func (f FakeConnection) Option(string) string {
return ""
}
func (FakeConnection) Index(string, []protocol.FileInfo) error {
func (FakeConnection) Index(string, []protocol.FileInfo, uint32, []protocol.Option) error {
return nil
}
func (FakeConnection) IndexUpdate(string, []protocol.FileInfo) error {
func (FakeConnection) IndexUpdate(string, []protocol.FileInfo, uint32, []protocol.Option) error {
return nil
}
func (f FakeConnection) Request(folder, name string, offset int64, size int) ([]byte, error) {
func (f FakeConnection) Request(folder, name string, offset int64, size int, hash []byte, flags uint32, options []protocol.Option) ([]byte, error) {
return f.requestData, nil
}
@@ -306,11 +306,11 @@ func BenchmarkRequest(b *testing.B) {
requestData: []byte("some data to return"),
}
m.AddConnection(fc, fc)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
b.ResetTimer()
for i := 0; i < b.N; i++ {
data, err := m.requestGlobal(device1, "default", files[i%n].Name, 0, 32, nil)
data, err := m.requestGlobal(device1, "default", files[i%n].Name, 0, 32, nil, 0, nil)
if err != nil {
b.Error(err)
}
@@ -564,7 +564,7 @@ func TestRefuseUnknownBits(t *testing.T) {
Name: "valid",
Flags: protocol.FlagsAll &^ (protocol.FlagInvalid | protocol.FlagSymlink),
},
})
}, 0, nil)
for _, name := range []string{"invalid1", "invalid2", "invalid3"} {
f, ok := m.CurrentGlobalFile("default", name)
@@ -666,7 +666,7 @@ func TestGlobalDirectoryTree(t *testing.T) {
return string(bytes)
}
m.Index(device1, "default", testdata)
m.Index(device1, "default", testdata, 0, nil)
result := m.GlobalDirectoryTree("default", "", -1, false)
@@ -925,7 +925,7 @@ func TestGlobalDirectorySelfFixing(t *testing.T) {
return string(bytes)
}
m.Index(device1, "default", testdata)
m.Index(device1, "default", testdata, 0, nil)
result := m.GlobalDirectoryTree("default", "", -1, false)
@@ -996,7 +996,7 @@ func BenchmarkTree_10000_50(b *testing.B) {
m.ScanFolder("default")
files := genDeepFiles(10000, 50)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -1011,7 +1011,7 @@ func BenchmarkTree_10000_10(b *testing.B) {
m.ScanFolder("default")
files := genDeepFiles(10000, 10)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -1026,7 +1026,7 @@ func BenchmarkTree_00100_50(b *testing.B) {
m.ScanFolder("default")
files := genDeepFiles(100, 50)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -1041,7 +1041,7 @@ func BenchmarkTree_00100_10(b *testing.B) {
m.ScanFolder("default")
files := genDeepFiles(100, 10)
m.Index(device1, "default", files)
m.Index(device1, "default", files, 0, nil)
b.ResetTimer()
for i := 0; i < b.N; i++ {