mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix storage tests so they run, but not by default

Browse source
This commit is contained in:
Matthew Wild 2018-10-01 20:21:26 +01:00
parent aadbe03b3d
commit e400842d43
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.busted
View file

@ -2,9 +2,12 @@ return {
_all = { _all = {
}, },
default = { default = {
["exclude-tags"] = "mod_bosh"; ["exclude-tags"] = "mod_bosh,storage";
}, };
bosh = { bosh = {
tags = "mod_bosh"; tags = "mod_bosh";
} };
storage = {
tags = "storage";
};
} }

15
spec/core_storagemanager.lua → spec/core_storagemanager_spec.lua
View file

@ -20,15 +20,23 @@ local configs = {
storage = "sql"; storage = "sql";
sql = { driver = "SQLite3", database = "prosody-tests.sqlite" }; sql = { driver = "SQLite3", database = "prosody-tests.sqlite" };
}; };
mysql = {
storage = "sql";
sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" };
};
postgres = {
storage = "sql";
sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" };
};
}; };
local test_host = "storage-unit-tests.invalid"; local test_host = "storage-unit-tests.invalid";
describe("storagemanager", function () describe("storagemanager", function ()
for _, backend in ipairs({ "internal", "sqlite" }) do for backend, backend_config in pairs(configs) do
local tagged_name = "#"..backend; local tagged_name = "#"..backend;
if backend ~= configs[backend].storage then if backend ~= backend_config.storage then
tagged_name = tagged_name.." #"..configs[backend].storage; tagged_name = tagged_name.." #"..backend_config.storage;
end end
insulate(tagged_name.." #storage backend", function () insulate(tagged_name.." #storage backend", function ()
mock_prosody(); mock_prosody();
@ -41,7 +49,6 @@ describe("storagemanager", function ()
-- Simple check to ensure insulation is working correctly -- Simple check to ensure insulation is working correctly
assert.is_nil(config.get(test_host, "storage")); assert.is_nil(config.get(test_host, "storage"));
local backend_config = configs[backend];
for k, v in pairs(backend_config) do for k, v in pairs(backend_config) do
config.set(test_host, k, v); config.set(test_host, k, v);
end end