Display the timeout different in timer assertions.

This commit is contained in:
Sönke Ludwig 2017-12-17 11:23:35 +01:00
parent c3fa500c3b
commit 2005c93f53
2 changed files with 17 additions and 15 deletions

View file

@ -26,8 +26,10 @@ void main()
dur = Clock.currTime(UTC()) - s_startTime; dur = Clock.currTime(UTC()) - s_startTime;
} }
assert(dur > 200.msecs); try {
assert(dur < 260.msecs); assert(dur > 200.msecs, (dur - 200.msecs).toString());
assert(dur < 260.msecs, (dur - 200.msecs).toString());
} catch (Exception e) assert(false, e.msg);
s_startTime += dur; s_startTime += dur;
@ -37,8 +39,8 @@ void main()
try { try {
auto dur = Clock.currTime(UTC()) - s_startTime; auto dur = Clock.currTime(UTC()) - s_startTime;
s_cnt++; s_cnt++;
assert(dur > 100.msecs * s_cnt); assert(dur > 100.msecs * s_cnt, (dur - 100.msecs * s_cnt).toString());
assert(dur < 100.msecs * s_cnt + 60.msecs); assert(dur < 100.msecs * s_cnt + 60.msecs, (dur - 100.msecs * s_cnt).toString());
assert(s_cnt <= 3); assert(s_cnt <= 3);
if (s_cnt == 3) { if (s_cnt == 3) {

View file

@ -22,17 +22,17 @@ void main()
// first timer: one-shot 200ms // first timer: one-shot 200ms
auto tm = eventDriver.timers.create(); auto tm = eventDriver.timers.create();
eventDriver.timers.wait(tm, (tm) nothrow @safe { eventDriver.timers.wait(tm, (tm) nothrow @safe {
Duration dur; try {
{
scope (failure) assert(false);
writefln("First timer"); writefln("First timer");
dur = Clock.currTime(UTC()) - s_startTime; auto dur = Clock.currTime(UTC()) - s_startTime;
}
assert(dur >= 200.msecs); assert(dur >= 200.msecs, (dur - 200.msecs).toString());
assert(dur < 250.msecs); assert(dur < 250.msecs, (dur - 200.msecs).toString());
timer1fired = true; timer1fired = true;
} catch (Exception e) {
assert(false, e.msg);
}
}); });
eventDriver.timers.set(tm, 200.msecs, 0.msecs); eventDriver.timers.set(tm, 200.msecs, 0.msecs);
@ -45,8 +45,8 @@ void main()
auto dur = Clock.currTime(UTC()) - s_startTime; auto dur = Clock.currTime(UTC()) - s_startTime;
s_cnt++; s_cnt++;
assert(dur > 100.msecs * s_cnt); assert(dur > 100.msecs * s_cnt, (dur - 100.msecs * s_cnt).toString());
assert(dur < 100.msecs * s_cnt + 60.msecs); assert(dur < 100.msecs * s_cnt + 60.msecs, (dur - 100.msecs * s_cnt).toString());
assert(s_cnt <= 3); assert(s_cnt <= 3);
if (s_cnt == 3) { if (s_cnt == 3) {