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

lib/model: Work around Mac filesystem precision in TestIgnores (ref #3996)

Browse Source
This commit is contained in:
Jakob Borg
2017-04-03 15:47:13 +02:00
parent 79eac61b09
commit da35820fd5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/model/model_test.go
View File

@@ -952,6 +952,12 @@ func changeIgnores(t *testing.T, m *Model, expected []string) {
ignores = append(ignores, "pox") ignores = append(ignores, "pox")
if runtime.GOOS == "darwin" {
// Mac has seconds-only timestamp precision, which tricks the ignore
// system into thinking the file has not changed. Work around it in
// an ugly way...
time.Sleep(time.Second)
}
err = m.SetIgnores("default", ignores) err = m.SetIgnores("default", ignores)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
@@ -962,14 +968,14 @@ func changeIgnores(t *testing.T, m *Model, expected []string) {
t.Error(err) t.Error(err)
} }
if arrEqual(expected, ignores2) {
t.Errorf("Incorrect ignores: %v == %v", ignores2, expected)
}
if !arrEqual(ignores, ignores2) { if !arrEqual(ignores, ignores2) {
t.Errorf("Incorrect ignores: %v != %v", ignores2, ignores) t.Errorf("Incorrect ignores: %v != %v", ignores2, ignores)
} }
if runtime.GOOS == "darwin" {
// see above
time.Sleep(time.Second)
}
err = m.SetIgnores("default", expected) err = m.SetIgnores("default", expected)
if err != nil { if err != nil {
t.Error(err) t.Error(err)