1 files changed, 24 insertions, 21 deletions

diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index 119d34b6..cc0b606c 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -2,38 +2,41 @@ local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
-test_env.unload_luarocks()
-
 describe("luarocks upload #integration", function()
 
-   before_each(function()
-      test_env.setup_specs()
-   end)
+   describe("general tests", function()
+      before_each(function()
+         test_env.setup_specs(nil)
+      end)
 
-   it("with no flags/arguments", function()
-      assert.is_false(run.luarocks_bool("upload"))
-   end)
+      it("with no flags/arguments", function()
+         assert.is_false(run.luarocks_bool("upload"))
+      end)
 
-   it("invalid rockspec", function()
-      assert.is_false(run.luarocks_bool("upload invalid.rockspec"))
-   end)
+      it("invalid rockspec", function()
+         assert.is_false(run.luarocks_bool("upload invalid.rockspec"))
+      end)
 
-   it("api key invalid", function()
-      assert.is_false(run.luarocks_bool("upload --api-key=invalid invalid.rockspec"))
-   end)
+      it("api key invalid", function()
+         assert.is_false(run.luarocks_bool("upload --api-key=invalid invalid.rockspec"))
+      end)
 
-   it("api key invalid and skip-pack", function()
-      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack " .. testing_paths.testing_server .. "/luasocket-${LUASOCKET}.rockspec"))
-   end)
+      it("api key invalid and skip-pack", function()
+         assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack " .. testing_paths.testing_server .. "/luasocket-${LUASOCKET}.rockspec"))
+      end)
 
-   it("force #unix", function()
-      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-${LUASOCKET}.rockspec"))
+      it("force #unix", function()
+         assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-${LUASOCKET}.rockspec"))
+      end)
    end)
 
    describe("tests with Xavante server #mock", function()
-      before_each(test_env.mock_server_init)
+      lazy_setup(function()
+         test_env.setup_specs(nil, "mock")
+         test_env.mock_server_init()
+      end)
 
-      after_each(test_env.mock_server_done)
+      lazy_teardown(test_env.mock_server_done)
 
       it("rockspec with api-key", function()
          assert.is_true(run.luarocks_bool("upload " .. testing_paths.fixtures_dir .. "/a_rock-1.0-1.rockspec " .. test_env.openssl_dirs .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testrun_dir .. "/luarocks_site.lua"}))