From da35820fd5a0149671dea2b4221e4684304ab81a Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 3 Apr 2017 15:47:13 +0200 Subject: [PATCH] lib/model: Work around Mac filesystem precision in TestIgnores (ref #3996) --- lib/model/model_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 6dd86109c..839ab44f4 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -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)