From fa710f6ddd6da354f3410d6d7ef42d306a54f145 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sun, 3 Apr 2022 14:32:52 +0200 Subject: refactor: re-enable packer.sync() in LvimReload (#2410) --- tests/specs/config_loader_spec.lua | 22 ++++++++++++++-------- tests/specs/plugins_load_spec.lua | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/specs/config_loader_spec.lua b/tests/specs/config_loader_spec.lua index 54cb4e96..1f2debc7 100644 --- a/tests/specs/config_loader_spec.lua +++ b/tests/specs/config_loader_spec.lua @@ -21,25 +21,31 @@ a.describe("config-loader", function() local test_path = "/tmp/lvim" os.execute(string.format([[echo "vim.opt.undodir = '%s'" >> %s]], test_path, user_config_path)) config:reload() - assert.equal(vim.opt.undodir:get()[1], test_path) + vim.schedule(function() + assert.equal(vim.opt.undodir:get()[1], test_path) + end) end) a.it("should not get interrupted by errors in user-config", function() local test_path = "/tmp/lunarvim" os.execute(string.format([[echo "vim.opt.undodir = '%s'" >> %s]], test_path, user_config_path)) config:reload() - assert.equal(vim.opt.undodir:get()[1], test_path) + vim.schedule(function() + assert.equal(vim.opt.undodir:get()[1], test_path) + end) os.execute(string.format("echo 'bad_string_test' >> %s", user_config_path)) local error_handler = function(msg) return msg end local err = xpcall(config:reload(), error_handler) assert.falsy(err) - assert.equal(vim.opt.undodir:get()[1], test_path) - local errmsg = vim.fn.eval "v:errmsg" - local exception = vim.fn.eval "v:exception" - assert.equal("", errmsg) -- v:errmsg was not updated. - assert.equal("", exception) - os.execute(string.format("echo '' > %s", user_config_path)) + vim.schedule(function() + assert.equal(vim.opt.undodir:get()[1], test_path) + local errmsg = vim.fn.eval "v:errmsg" + local exception = vim.fn.eval "v:exception" + assert.equal("", errmsg) -- v:errmsg was not updated. + assert.equal("", exception) + os.execute(string.format("echo '' > %s", user_config_path)) + end) end) end) diff --git a/tests/specs/plugins_load_spec.lua b/tests/specs/plugins_load_spec.lua index e5f1a09e..d32c521d 100644 --- a/tests/specs/plugins_load_spec.lua +++ b/tests/specs/plugins_load_spec.lua @@ -57,8 +57,8 @@ a.describe("plugin-loader", function() _G.completed = true end end - vim.cmd [[autocmd User PackerComplete lua _G.verify_sha()]] - loader.sync_core_plugins() + vim.cmd [[autocmd User PackerComplete ++once lua _G.verify_sha()]] + loader.load_snapshot() local ret = vim.wait(30 * 10 * 1000, function() return _G.completed == true end, 200) -- cgit v1.2.3