Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 8 insertions, 5 deletions

diff --git a/test/functional/vimscript/reltime_spec.lua b/test/functional/vimscript/reltime_spec.lua
index 7cdb78e4ce..fa110d602a 100644
--- a/test/functional/vimscript/reltime_spec.lua
+++ b/test/functional/vimscript/reltime_spec.lua
@@ -1,6 +1,9 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, eq, ok = helpers.clear, helpers.eq, helpers.ok
-local neq, command, fn = helpers.neq, helpers.command, helpers.fn
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, eq, ok = n.clear, t.eq, t.ok
+local neq, command, fn = t.neq, n.command, n.fn
+local matches = t.matches
 local reltime, reltimestr, reltimefloat = fn.reltime, fn.reltimestr, fn.reltimefloat
 
 describe('reltimestr(), reltimefloat()', function()
@@ -15,7 +18,7 @@ describe('reltimestr(), reltimefloat()', function()
     neq('0.0', reltimestr(elapsed))
     ok(reltimefloat(elapsed) > 0.0)
     -- original vim test for < 0.1, but easily fails on travis
-    ok(nil ~= string.match(reltimestr(elapsed), '0%.'))
+    matches('0%.', reltimestr(elapsed))
     ok(reltimefloat(elapsed) < 1.0)
 
     local same = reltime(now, now)
@@ -29,7 +32,7 @@ describe('reltimestr(), reltimefloat()', function()
     neq('0.0', reltimestr(differs))
     ok(reltimefloat(differs) > 0.0)
     -- original vim test for < 0.1, but easily fails on travis
-    ok(nil ~= string.match(reltimestr(differs), '0%.'))
+    matches('0%.', reltimestr(differs))
     ok(reltimefloat(differs) < 1.0)
   end)