From e39dade80b023bc6ac1b5592d1e1637d0c1a2502 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 8 Oct 2018 08:56:13 +0200 Subject: test: adjust timer tests Timer tests are less reliable on Travis CI macOS 10.12 (most egregious). Also somewhat on 10.13. --- test/functional/eval/timer_spec.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/functional/eval/timer_spec.lua b/test/functional/eval/timer_spec.lua index 8afc3592cc..040ab30522 100644 --- a/test/functional/eval/timer_spec.lua +++ b/test/functional/eval/timer_spec.lua @@ -1,6 +1,6 @@ local helpers = require('test.functional.helpers')(after_each) local Screen = require('test.functional.ui.screen') -local ok, feed, eq, eval = helpers.ok, helpers.feed, helpers.eq, helpers.eval +local feed, eq, eval = helpers.feed, helpers.eq, helpers.eval local source, nvim_async, run = helpers.source, helpers.nvim_async, helpers.run local clear, command, funcs = helpers.clear, helpers.command, helpers.funcs local curbufmeths = helpers.curbufmeths @@ -72,7 +72,8 @@ describe('timers', function() run(nil, nil, nil, 300) feed("") local diff = eval("g:val") - count - ok(0 <= diff and diff <= 4) + assert(0 <= diff and diff <= 4, + 'expected (0 <= diff <= 4), got: '..tostring(diff)) end) it('are triggered in blocking getchar() call', function() @@ -81,7 +82,7 @@ describe('timers', function() run(nil, nil, nil, 300) feed("c") local count = eval("g:val") - ok(count >= 4) + assert(count >= 4, 'expected count >= 4, got: '..tostring(count)) eq(99, eval("g:c")) end) @@ -142,9 +143,10 @@ describe('timers', function() local count = eval("g:val") run(nil, nil, nil, 300) local count2 = eval("g:val") - ok(4 <= count and count <= 7) -- when count is eval:ed after timer_stop this should be non-racy eq(count, count2) + assert(4 <= count and count <= 7, + 'expected (4 <= count <= 7), got: '..tostring(count)) end) it('can be stopped from the handler', function() -- cgit