From 5be13f62a2fc02097f6a530357bc4564355c2efa Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 16 Jun 2020 06:31:55 +0200 Subject: [PATCH] lib/model: Fix minor flakiness in TestModTimeWindow --- lib/model/model_test.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/model/model_test.go b/lib/model/model_test.go index caae11e53..d7e60a28c 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -3389,36 +3389,40 @@ func TestModTimeWindow(t *testing.T) { m.ScanFolders() - v := protocol.Vector{} - v = v.Update(myID.Short()) + // Get current version + fi, ok := m.CurrentFolderFile("default", name) if !ok { t.Fatal("File missing") } - if !fi.Version.Equal(v) { - t.Fatalf("Got version %v, expected %v", fi.Version, v) - } + v := fi.Version + + // Update time on disk 1s err = tfs.Chtimes(name, time.Now(), modTime.Add(time.Second)) must(t, err) m.ScanFolders() - // No change due to window + // No change due to within window + fi, _ = m.CurrentFolderFile("default", name) if !fi.Version.Equal(v) { t.Fatalf("Got version %v, expected %v", fi.Version, v) } + // Update to be outside window + err = tfs.Chtimes(name, time.Now(), modTime.Add(2*time.Second)) must(t, err) m.ScanFolders() - v = v.Update(myID.Short()) + // Version should have updated + fi, _ = m.CurrentFolderFile("default", name) - if !fi.Version.Equal(v) { - t.Fatalf("Got version %v, expected %v", fi.Version, v) + if fi.Version.Compare(v) != protocol.Greater { + t.Fatalf("Got result %v, expected %v", fi.Version.Compare(v), protocol.Greater) } }