mirror of
https://github.com/koreader/koreader.git
synced 2025-12-13 20:36:53 +01:00
tests: drop package.unloadAll workaround
Unnecessary, busted auto-insulation already insulate each test file run.
This commit is contained in:
committed by
Frans de Jonge
parent
7a5465bfe6
commit
cb2d67aac9
@@ -1,7 +1,6 @@
|
||||
describe("AutoSuspend", function()
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
end)
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ describe("BatteryState plugin tests", function()
|
||||
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
time = require("ui/time")
|
||||
MockTime = require("mock_time")
|
||||
@@ -16,7 +15,6 @@ describe("BatteryState plugin tests", function()
|
||||
|
||||
teardown(function()
|
||||
MockTime:uninstall()
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
end)
|
||||
|
||||
|
||||
@@ -56,30 +56,3 @@ package.reload = function(name)
|
||||
assert(package.unload(name))
|
||||
return require(name)
|
||||
end
|
||||
|
||||
package.unloadAll = function()
|
||||
local candidates = {
|
||||
"spec/",
|
||||
"frontend/",
|
||||
"plugins/",
|
||||
"datastorage.lua",
|
||||
"defaults.lua",
|
||||
}
|
||||
local pending = {}
|
||||
for name, _ in pairs(package.loaded) do
|
||||
local path = package.searchpath(name, package.path)
|
||||
if path ~= nil then
|
||||
for _, candidate in ipairs(candidates) do
|
||||
if path:find(candidate) == 1 then
|
||||
table.insert(pending, name)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
for _, name in ipairs(pending) do
|
||||
if name ~= "commonrequire" then
|
||||
assert(package.unload(name))
|
||||
end
|
||||
end
|
||||
return #pending
|
||||
end
|
||||
|
||||
@@ -31,7 +31,6 @@ describe("device module", function()
|
||||
end
|
||||
}
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
ffi = require("ffi")
|
||||
C = ffi.C
|
||||
require("ffi/linux_input_h")
|
||||
|
||||
@@ -2,7 +2,6 @@ describe("FileManager module", function()
|
||||
local DataStorage, FileManager, lfs, docsettings, UIManager, Screen, makePath, util
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
DataStorage = require("datastorage")
|
||||
FileManager = require("apps/filemanager/filemanager")
|
||||
|
||||
@@ -3,7 +3,6 @@ describe("Frontlight function in PowerD", function()
|
||||
local param, test_when_on, test_when_off
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
|
||||
PowerD = require("device/generic/powerd"):new{
|
||||
@@ -28,7 +27,6 @@ describe("Frontlight function in PowerD", function()
|
||||
end)
|
||||
|
||||
teardown(function()
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
end)
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ describe("Readerfooter module", function()
|
||||
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
local Device = require("device")
|
||||
-- Override powerd for running tests on devices with batteries.
|
||||
Device.powerd.isChargingHW = function() return false end
|
||||
|
||||
@@ -4,7 +4,6 @@ describe("Readerhighlight module", function()
|
||||
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
DataStorage = require("datastorage")
|
||||
DocumentRegistry = require("document/documentregistry")
|
||||
|
||||
@@ -3,7 +3,6 @@ describe("ReaderLink module", function()
|
||||
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
DocumentRegistry = require("document/documentregistry")
|
||||
Event = require("ui/event")
|
||||
|
||||
@@ -3,7 +3,6 @@ describe("Readerview module", function()
|
||||
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
require("document/canvascontext"):init(require("device"))
|
||||
DocumentRegistry = require("document/documentregistry")
|
||||
Blitbuffer = require("ffi/blitbuffer")
|
||||
|
||||
@@ -5,7 +5,6 @@ describe("WakeupMgr", function()
|
||||
|
||||
setup(function()
|
||||
require("commonrequire")
|
||||
package.unloadAll()
|
||||
RTC = require("ffi/rtc")
|
||||
WakeupMgr = require("device/wakeupmgr"):new{}
|
||||
-- We could theoretically test this by running the tests as root locally.
|
||||
|
||||
Reference in New Issue
Block a user