Tests: move mock-server utils into test_environment.lua

This avoids trouble with changing package.paths during
tests.

4 files changed, 43 insertions, 51 deletions

diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 6b2e2147..29449ff5 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -1,12 +1,11 @@
 local test_env = require("test/test_environment")
-local test_mock_server = require("test/test_mock_server")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
 
-local extra_rocks = test_mock_server.extra_rocks({
+local extra_rocks = test_env.mock_server_extra_rocks({
    "/abelhas-1.0-1.rockspec",
    "/lpeg-0.12-1.rockspec"
 })
@@ -38,12 +37,12 @@ describe("LuaRocks new_version tests #blackbox #b_new_version", function()
 
    describe("LuaRocks new_version more complex tests", function()
       it("LuaRocks new version with remote spec", function()
-         test_mock_server.init()
+         test_env.mock_server_init()
          assert.is_true(run.luarocks_bool("new_version http://localhost:8080/file/a_rock-1.0-1.rockspec"))
          assert.is.truthy(lfs.attributes("a_rock-1.0-1.rockspec"))
          assert.is.truthy(lfs.attributes("a_rock-1.0-2.rockspec"))
          test_env.remove_files(lfs.currentdir(), "luasocket--")
-         test_mock_server.done()
+         test_env.mock_server_done()
       end)
 
       it("LuaRocks new_version of luacov", function()
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index cf915eb3..b8e147e0 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -1,11 +1,10 @@
 local test_env = require("test/test_environment")
-local test_mock_server = require("test/test_mock_server")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
 
-local extra_rocks = test_mock_server.extra_rocks()
+local extra_rocks = test_env.mock_server_extra_rocks()
 
 describe("LuaRocks upload tests #blackbox #b_upload", function()
 
@@ -35,9 +34,9 @@ describe("LuaRocks upload tests #blackbox #b_upload", function()
    end)
 
    describe("LuaRocks upload tests with Xavante server #mock", function()
-      before_each(test_mock_server.init)
+      before_each(test_env.mock_server_init)
       
-      after_each(test_mock_server.done)
+      after_each(test_env.mock_server_done)
 
       it("LuaRocks upload rockspec with api-key", function()
          assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_dir .. "/testfiles/a_rock-1.0-1.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"}))
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 56b394cd..a663c1c3 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -685,6 +685,43 @@ local function install_luarocks(install_env_vars)
    print("LuaRocks installed correctly!")
 end
 
+function test_env.mock_server_extra_rocks(more)
+   local rocks = {
+      -- 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",
+      "/luafilesystem-1.6.3-1.src.rock",
+      "/luasec-0.6-1.rockspec",
+      "/luasocket-3.0rc1-2.src.rock",
+      "/luasocket-3.0rc1-2.rockspec",
+      "/restserver-0.1-1.src.rock",
+      "/restserver-xavante-0.2-1.src.rock",
+      "/rings-1.3.0-1.src.rock",
+      "/wsapi-1.6.1-1.src.rock",
+      "/wsapi-xavante-1.6.1-1.src.rock",
+      "/xavante-2.4.0-1.src.rock"
+   }
+   if more then
+      for _, rock in ipairs(more) do
+         table.insert(rocks, rock)
+      end
+   end
+   return rocks
+end
+
+function test_env.mock_server_init()
+   local assert = require("luassert")
+   local testing_paths = test_env.testing_paths
+   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
+
+function test_env.mock_server_done()
+   os.execute("curl localhost:8080/shutdown")
+end
+
 ---
 -- Main function to create config files and testing environment 
 function test_env.main()
diff --git a/test/test_mock_server.lua b/test/test_mock_server.lua
deleted file mode 100644
index 74a57b89..00000000
--- a/test/test_mock_server.lua
+++ /dev/null
@@ -1,43 +0,0 @@
---- Utility module to launch the mock-server from within test spec files.
-local test_mock_server = {}
-
-local assert = require("luassert")
-local test_env = require("test/test_environment")
-local testing_paths = test_env.testing_paths
-
-function test_mock_server.extra_rocks(more)
-   local rocks = {
-      -- 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",
-      "/luafilesystem-1.6.3-1.src.rock",
-      "/luasec-0.6-1.rockspec",
-      "/luasocket-3.0rc1-2.src.rock",
-      "/luasocket-3.0rc1-2.rockspec",
-      "/restserver-0.1-1.src.rock",
-      "/restserver-xavante-0.2-1.src.rock",
-      "/rings-1.3.0-1.src.rock",
-      "/wsapi-1.6.1-1.src.rock",
-      "/wsapi-xavante-1.6.1-1.src.rock",
-      "/xavante-2.4.0-1.src.rock"
-   }
-   if more then
-      for _, rock in ipairs(more) do
-         table.insert(rocks, rock)
-      end
-   end
-   return rocks
-end
-
-function test_mock_server.init()
-   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
-
-function test_mock_server.done()
-   os.execute("curl localhost:8080/shutdown")
-end
-
-return test_mock_server