From 71a2172edf06d75476a8878bce5a315ae462d558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Sat, 23 Nov 2019 09:36:07 +0100 Subject: [PATCH] Increase directory watcher test sleep time on macOS (decrease on others). --- tests/dirwatcher.d | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/dirwatcher.d b/tests/dirwatcher.d index 8f0ef92..d1f739f 100644 --- a/tests/dirwatcher.d +++ b/tests/dirwatcher.d @@ -20,6 +20,11 @@ import std.typecons : No, Yes; import core.exception : AssertError; import core.time : msecs, seconds; + +version (OSX) enum sleepTime = 3.seconds; +else enum sleepTime = 500.msecs; + + void runTest() { auto dir = buildPath(tempDir, format("dirwatcher_test_%d", thisProcessID())); @@ -41,7 +46,7 @@ void runTest() static DirectoryChange dc(Type t, string p) { return DirectoryChange(t, Path(p)); } void check(DirectoryChange[] expected) { - sleep(1500.msecs); + sleep(sleepTime); assert(watcher.readChanges(changes, 100.msecs), "Could not read changes for " ~ expected.to!string); assert(expected.all!((a)=> changes.canFind(a))(), "Change is not what was expected, got: " ~ changes.to!string ~ " but expected: " ~ expected.to!string); assert(!watcher.readChanges(changes, 0.msecs), "Changes were returned when they shouldn't have, for " ~ expected.to!string); @@ -49,15 +54,15 @@ void runTest() write(foo, null); check([dc(Type.added, foo)]); - sleep(1500.msecs); + sleep(sleepTime); write(foo, [0, 1]); check([dc(Type.modified, foo)]); remove(foo); check([dc(Type.removed, foo)]); write(foo, null); - sleep(1500.msecs); + sleep(sleepTime); write(foo, [0, 1]); - sleep(1500.msecs); + sleep(sleepTime); remove(foo); check([dc(Type.added, foo), dc(Type.modified, foo), dc(Type.removed, foo)]); @@ -70,23 +75,23 @@ void runTest() remove(bar); watcher = Path(dir).watchDirectory(Yes.recursive); write(foo, null); - sleep(1500.msecs); + sleep(sleepTime); write(foo, [0, 1]); - sleep(1500.msecs); + sleep(sleepTime); remove(foo); write(bar, null); - sleep(1500.msecs); + sleep(sleepTime); write(bar, [0, 1]); - sleep(1500.msecs); + sleep(sleepTime); remove(bar); check([dc(Type.added, foo), dc(Type.modified, foo), dc(Type.removed, foo), dc(Type.added, bar), dc(Type.modified, bar), dc(Type.removed, bar)]); write(foo, null); - sleep(1500.msecs); + sleep(sleepTime); rename(foo, bar); - sleep(1500.msecs); + sleep(sleepTime); remove(bar); check([dc(Type.added, foo), dc(Type.removed, foo), dc(Type.added, bar), dc(Type.removed, bar)]);