mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-23 03:18:59 +00:00
lib/model: Work around Mac filesystem precision in TestIgnores (ref #3996)
This commit is contained in:
parent
79eac61b09
commit
da35820fd5
@ -952,6 +952,12 @@ func changeIgnores(t *testing.T, m *Model, expected []string) {
|
||||
|
||||
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)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
@ -962,14 +968,14 @@ func changeIgnores(t *testing.T, m *Model, expected []string) {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
if arrEqual(expected, ignores2) {
|
||||
t.Errorf("Incorrect ignores: %v == %v", ignores2, expected)
|
||||
}
|
||||
|
||||
if !arrEqual(ignores, ignores2) {
|
||||
t.Errorf("Incorrect ignores: %v != %v", ignores2, ignores)
|
||||
}
|
||||
|
||||
if runtime.GOOS == "darwin" {
|
||||
// see above
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
err = m.SetIgnores("default", expected)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
|
Loading…
Reference in New Issue
Block a user