From a90a2066b08b4cc047be84c673024f7f5e9fa054 Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 18 Jul 2016 17:35:40 +0200 Subject: Fix of upload tests for lua5.3 --- spec/install_spec.lua | 4 ++-- spec/make_spec.lua | 2 +- spec/pack_spec.lua | 2 +- spec/upload_spec.lua | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/install_spec.lua b/spec/install_spec.lua index 0b2ffb53..28e349c3 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua @@ -83,14 +83,14 @@ describe("LuaRocks install tests #blackbox #b_install", function() end) it("LuaRocks install only-deps of luasocket packed rock", function() - assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket")) + assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket 3.0rc1-1")) local output = run.luarocks("install --only-deps " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock") assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-1") assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) end) it("LuaRocks install reinstall", function() - assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket")) + assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket 3.0rc1-1")) assert.is_true(run.luarocks_bool("install " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) assert.is_true(run.luarocks_bool("install --deps-mode=none " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) diff --git a/spec/make_spec.lua b/spec/make_spec.lua index 2821c143..3e843f7b 100644 --- a/spec/make_spec.lua +++ b/spec/make_spec.lua @@ -27,7 +27,7 @@ describe("LuaRocks make tests #blackbox #b_make", function() it("LuaRocks make with rockspec", function() -- make luasocket - assert.is_true(run.luarocks_bool("download --source luasocket")) + assert.is_true(run.luarocks_bool("download --source luasocket 3.0rc1-1")) assert.is_true(run.luarocks_bool("unpack luasocket-3.0rc1-1.src.rock")) lfs.chdir("luasocket-3.0rc1-1/luasocket-3.0-rc1/") assert.is_true(run.luarocks_bool("make luasocket-3.0rc1-1.rockspec")) diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua index 67ed5f3f..78aab9aa 100644 --- a/spec/pack_spec.lua +++ b/spec/pack_spec.lua @@ -52,7 +52,7 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() it("LuaRocks pack src", function() assert.is_true(run.luarocks_bool("install luasec")) - assert.is_true(run.luarocks_bool("download --rockspec luasocket")) + assert.is_true(run.luarocks_bool("download --rockspec luasocket 3.0rc1-1")) assert.is_true(run.luarocks_bool("pack luasocket-3.0rc1-1.rockspec")) assert.is_true(test_env.remove_files(lfs.currentdir(), "luasocket-")) end) diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua index d959f64a..02b68611 100644 --- a/spec/upload_spec.lua +++ b/spec/upload_spec.lua @@ -7,6 +7,7 @@ test_env.unload_luarocks() local extra_rocks = { "/lua-cjson-2.1.0-1.src.rock", + -- rocks needed for mock-server "/copas-2.0.1-1.src.rock", "/coxpcall-1.16.0-1.src.rock", "/dkjson-2.5-2.src.rock", @@ -50,7 +51,7 @@ describe("LuaRocks upload tests #blackbox #b_upload", function() assert.is_true(run.luarocks_bool("install lua-cjson")) end) - describe("LuaRocks upload tests with Xavante server", function() + describe("LuaRocks upload tests with Xavante server #mock", function() before_each(function() assert.is_true(test_env.need_rock("restserver-xavante")) local final_command = test_env.execute_helper(testing_paths.lua .. " " .. testing_paths.testing_dir .. "/mock-server.lua &", true, test_env.env_variables) -- cgit v1.2.3-55-g6feb