From a0a86fdc049a8e2b28537b0ec0b35c1c45289f2a Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 26 Sep 2025 09:05:07 +0800 Subject: [PATCH] test: make preload of functional/testnvim.lua explicit (#35919) Before functional/testnvim.lua was moved from functional/testutil.lua in 052498ed42780a76daea589d063cd8947a894673, it was explicitly preloaded, but now it is preloaded implicitly via functional/ui/screen.lua. Also fix warnings about unused variables in other preload.lua files. --- test/benchmark/preload.lua | 2 +- test/functional/preload.lua | 1 + test/unit/preload.lua | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/benchmark/preload.lua b/test/benchmark/preload.lua index a7b815ddf8..8d0b65e2c8 100644 --- a/test/benchmark/preload.lua +++ b/test/benchmark/preload.lua @@ -1,4 +1,4 @@ -- Modules loaded here will not be cleared and reloaded by Busted. -- Busted started doing this to help provide more isolation. See issue #62 -- for more information about this. -local n = require('test.functional.testnvim') +require('test.functional.testnvim')() diff --git a/test/functional/preload.lua b/test/functional/preload.lua index 02832bb988..4aef9eb70b 100644 --- a/test/functional/preload.lua +++ b/test/functional/preload.lua @@ -2,6 +2,7 @@ -- Busted started doing this to help provide more isolation. See issue #62 -- for more information about this. local t = require('test.testutil') +require('test.functional.testnvim')() require('test.functional.ui.screen') local has_ffi, ffi = pcall(require, 'ffi') diff --git a/test/unit/preload.lua b/test/unit/preload.lua index 1865bba719..7c88007e14 100644 --- a/test/unit/preload.lua +++ b/test/unit/preload.lua @@ -1,6 +1,6 @@ -- Modules loaded here will not be cleared and reloaded by Busted. -- Busted started doing this to help provide more isolation. See issue #62 -- for more information about this. -local ffi = require('ffi') -local t = require('test.unit.testutil') -local preprocess = require('test.unit.preprocess') +require('ffi') +require('test.unit.testutil') +require('test.unit.preprocess')