From 870948dd2d4e208dd98ada966a109cf7156b3e4d Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 13 Mar 2024 13:08:03 -0300 Subject: tests: minor tweaks --- spec/build_spec.lua | 2 -- spec/test_spec.lua | 17 +---------------- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'spec') diff --git a/spec/build_spec.lua b/spec/build_spec.lua index 08a9c93f..3b5185e1 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -21,8 +21,6 @@ local extra_rocks = { "/luasocket-${LUASOCKET}.src.rock", "/luasocket-${LUASOCKET}.rockspec", "spec/fixtures/a_rock-1.0-1.src.rock", - "/busted-2.0.0-1.rockspec", - "/busted-2.0.rc13-0.rockspec", } local c_module_source = [[ diff --git a/spec/test_spec.lua b/spec/test_spec.lua index 194dcfd1..6d546522 100644 --- a/spec/test_spec.lua +++ b/spec/test_spec.lua @@ -19,7 +19,7 @@ local extra_rocks = { describe("luarocks test #integration", function() - before_each(function() + lazy_setup(function() test_env.setup_specs(extra_rocks) end) @@ -35,21 +35,6 @@ describe("luarocks test #integration", function() describe("busted backend", function() - lazy_setup(function() - -- Try to cache rocks from the host system to speed up test - for _, r in ipairs(extra_rocks) do - r = test_env.V(r) - local n, v = r:match("^/(.*)%-([^%-]+)%-%d+%.[^%-]+$") - os.execute("luarocks pack " .. n .. " " .. v) - end - if test_env.TEST_TARGET_OS == "windows" then - os.execute("move *.rock " .. testing_paths.testing_server) - else - os.execute("mv *.rock " .. testing_paths.testing_server) - end - test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server) - end) - it("with rockspec, installing busted", function() finally(function() -- delete downloaded and unpacked files -- cgit v1.2.3-55-g6feb