Merge pull request #728 from mpeterv/test-fixes

Fix spec failure under LuaJIT 2.1.0-beta3 + other test fixes

2 files changed, 8 insertions, 9 deletions

diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index ff39cb96..6ec8e302 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -5,8 +5,6 @@ local testing_paths = test_env.testing_paths
 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",
@@ -42,18 +40,17 @@ describe("LuaRocks upload tests #blackbox #b_upload", function()
    end)
    
    it("LuaRocks upload api key invalid and skip-pack", function()
-      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack luacov-0.11.0-1.rockspec"))
+      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec"))
    end)
    
    it("LuaRocks upload force #unix", function()
-      assert.is_true(run.luarocks_bool("install lua-cjson"))
-      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force luacov-0.11.0-1.rockspec"))
-      assert.is_true(run.luarocks_bool("install lua-cjson"))
+      assert.is_true(test_env.need_rock("dkjson"))
+      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec"))
    end)
 
    describe("LuaRocks upload tests with Xavante server #mock", function()
       before_each(function()
-         assert.is.truthy(test_env.need_rock("restserver-xavante"))
+         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)
          os.execute(final_command)
       end)
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 6f6f1cfe..bc1e5277 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -285,7 +285,7 @@ end
 -- @param save_path string: path to directory, where to download rocks/rockspecs
 -- @return make_manifest boolean: true if new rocks downloaded
 local function download_rocks(urls, save_path)
-   local luarocks_repo = "https://www.luarocks.org"   
+   local luarocks_repo = "https://luarocks.org"
    local make_manifest = false
 
    for _, url in ipairs(urls) do
@@ -533,7 +533,9 @@ function test_env.setup_specs(extra_rocks)
    end
 end
 
---- Test if required rock is installed if not, install it
+--- Test if required rock is installed and if not, install it.
+-- Return `true` if the rock is already installed or has been installed successfully,
+-- `false` if installation failed.
 function test_env.need_rock(rock)
    print("Check if " .. rock .. " is installed")
    if test_env.run.luarocks_noprint_nocov(test_env.quiet("show " .. rock)) then