octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-10 07:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Fix wrongly hardcoded arguments in test helper (#7749)

Browse Source
This commit is contained in:
Simon Frei 2021-06-05 17:01:23 +02:00 committed by GitHub
parent b1e0e7b923
commit 18592af993
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/model/folder_recvonly_test.go
View File

@ -139,7 +139,7 @@ func TestRecvOnlyRevertNeeds(t *testing.T) {
if size.Files != 1 || size.Directories != 1 { if size.Files != 1 || size.Directories != 1 {
t.Fatalf("Local: expected 1 file and 1 directory: %+v", size) t.Fatalf("Local: expected 1 file and 1 directory: %+v", size)
} }
size = needSize(t, m, "ro") size = needSizeLocal(t, m, "ro")
if size.Files+size.Directories > 0 { if size.Files+size.Directories > 0 {
t.Fatalf("Need: expected nothing: %+v", size) t.Fatalf("Need: expected nothing: %+v", size)
} }
@ -168,7 +168,7 @@ func TestRecvOnlyRevertNeeds(t *testing.T) {
if size.Files != 1 || size.Bytes != sizeOfDir+int64(len(newData)) { if size.Files != 1 || size.Bytes != sizeOfDir+int64(len(newData)) {
t.Fatalf("Local: expected the new file to be reflected: %+v", size) t.Fatalf("Local: expected the new file to be reflected: %+v", size)
} }
size = needSize(t, m, "ro") size = needSizeLocal(t, m, "ro")
if size.Files+size.Directories > 0 { if size.Files+size.Directories > 0 {
t.Fatalf("Need: expected nothing: %+v", size) t.Fatalf("Need: expected nothing: %+v", size)
} }
@ -189,7 +189,7 @@ func TestRecvOnlyRevertNeeds(t *testing.T) {
if size.Files != 1 || size.Bytes != sizeOfDir+int64(len(newData)) { if size.Files != 1 || size.Bytes != sizeOfDir+int64(len(newData)) {
t.Fatalf("Local: expected the local size to remain: %+v", size) t.Fatalf("Local: expected the local size to remain: %+v", size)
} }
size = needSize(t, m, "ro") size = needSizeLocal(t, m, "ro")
if size.Files != 1 || size.Bytes != int64(len(oldData)) { if size.Files != 1 || size.Bytes != int64(len(oldData)) {
t.Fatalf("Local: expected to need the old file data: %+v", size) t.Fatalf("Local: expected to need the old file data: %+v", size)
} }
@ -229,7 +229,7 @@ func TestRecvOnlyUndoChanges(t *testing.T) {
if size.Files != 1 || size.Directories != 1 { if size.Files != 1 || size.Directories != 1 {
t.Fatalf("Local: expected 1 file and 1 directory: %+v", size) t.Fatalf("Local: expected 1 file and 1 directory: %+v", size)
} }
size = needSize(t, m, "ro") size = needSizeLocal(t, m, "ro")
if size.Files+size.Directories > 0 { if size.Files+size.Directories > 0 {
t.Fatalf("Need: expected nothing: %+v", size) t.Fatalf("Need: expected nothing: %+v", size)
} }
@ -299,7 +299,7 @@ func TestRecvOnlyDeletedRemoteDrop(t *testing.T) {
if size.Files != 1 || size.Directories != 1 { if size.Files != 1 || size.Directories != 1 {
t.Fatalf("Local: expected 1 file and 1 directory: %+v", size) t.Fatalf("Local: expected 1 file and 1 directory: %+v", size)
} }
size = needSize(t, m, "ro") size = needSizeLocal(t, m, "ro")
if size.Files+size.Directories > 0 { if size.Files+size.Directories > 0 {
t.Fatalf("Need: expected nothing: %+v", size) t.Fatalf("Need: expected nothing: %+v", size)
} }
@ -364,7 +364,7 @@ func TestRecvOnlyRemoteUndoChanges(t *testing.T) {
if size.Files != 1 || size.Directories != 1 { if size.Files != 1 || size.Directories != 1 {
t.Fatalf("Local: expected 1 file and 1 directory: %+v", size) t.Fatalf("Local: expected 1 file and 1 directory: %+v", size)
} }
size = needSize(t, m, "ro") size = needSizeLocal(t, m, "ro")
if size.Files+size.Directories > 0 { if size.Files+size.Directories > 0 {
t.Fatalf("Need: expected nothing: %+v", size) t.Fatalf("Need: expected nothing: %+v", size)
} }

2
lib/model/model_test.go
View File

@ -2358,7 +2358,7 @@ func TestIssue3496(t *testing.T) {
t.Log(comp) t.Log(comp)
// Check that NeedSize does the correct thing // Check that NeedSize does the correct thing
need := needSize(t, m, "default") need := needSizeLocal(t, m, "default")
if need.Files != 1 || need.Bytes != 1234 { if need.Files != 1 || need.Bytes != 1234 {
// The one we added synthetically above // The one we added synthetically above
t.Errorf("Incorrect need size; %d, %d != 1, 1234", need.Files, need.Bytes) t.Errorf("Incorrect need size; %d, %d != 1, 1234", need.Files, need.Bytes)

4
lib/model/testutils_test.go
View File

@ -194,7 +194,7 @@ func (m *testModel) testCurrentFolderFile(folder string, file string) (protocol.
} }
func (m *testModel) testCompletion(device protocol.DeviceID, folder string) FolderCompletion { func (m *testModel) testCompletion(device protocol.DeviceID, folder string) FolderCompletion {
comp, err := m.Completion(protocol.LocalDeviceID, "default") comp, err := m.Completion(device, folder)
must(m.t, err) must(m.t, err)
return comp return comp
} }
@ -276,7 +276,7 @@ func receiveOnlyChangedSize(t *testing.T, m Model, folder string) db.Counts {
return snap.ReceiveOnlyChangedSize() return snap.ReceiveOnlyChangedSize()
} }
func needSize(t *testing.T, m Model, folder string) db.Counts { func needSizeLocal(t *testing.T, m Model, folder string) db.Counts {
t.Helper() t.Helper()
snap := dbSnapshot(t, m, folder) snap := dbSnapshot(t, m, folder)
defer snap.Release() defer snap.Release()