tests: reorganize and speed up unit tests

1 files changed, 4 insertions, 5 deletions

diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index d47cfd05..18271176 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -3,8 +3,6 @@ local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
-test_env.unload_luarocks()
-
 local extra_rocks = {
    "/abelhas-1.1-1.rockspec",
    "/lpeg-${LPEG}.rockspec"
@@ -12,7 +10,7 @@ local extra_rocks = {
 
 describe("luarocks new_version #integration", function()
 
-   setup(function()
+   lazy_setup(function()
       test_env.setup_specs(extra_rocks)
    end)
 
@@ -69,10 +67,11 @@ describe("luarocks new_version #integration", function()
    end)
 
    describe("remote tests #mock", function()
-      setup(function()
+      lazy_setup(function()
+         test_env.setup_specs(extra_rocks, "mock")
          test_env.mock_server_init()
       end)
-      teardown(function()
+      lazy_teardown(function()
          test_env.mock_server_done()
       end)
       it("with remote spec", function()