2 files changed, 125 insertions, 6 deletions

diff --git a/spec/util/git_repo.lua b/spec/util/git_repo.lua
new file mode 100644
index 00000000..6cccfcc4
--- /dev/null
+++ b/spec/util/git_repo.lua
@@ -0,0 +1,107 @@
+local git_repo = {}
+
+local test_env = require("spec.util.test_env")
+local lfs = require("lfs")
+
+local files = {
+----------------------------------------
+["testrock-dev-1.rockspec"] = [[
+package = "testrock"
+version = "dev-1"
+source = {
+   url = "git://localhost:20000/testrock"
+}
+description = {
+   homepage = "https://localhost",
+   license = "MIT"
+}
+dependencies = {}
+build = {
+   type = "builtin",
+   modules = {
+      testrock = "testrock.lua"
+   }
+}
+]],
+----------------------------------------
+["testrock.lua"] = [[
+local testrock = {}
+
+function testrock.say()
+   return "Hello, world!"
+end
+
+return testrock
+]],
+----------------------------------------
+["foo.c"] = [[
+#include <lua.h>
+int luaopen_foo(lua_State* L) {
+   lua_pushnumber(L, 42);
+   return 1;
+}
+]],
+----------------------------------------
+["test.lua"] = [[
+print("this should be ignored!")
+]],
+}
+
+local function write_file(filename, contents)
+   local fd = assert(io.open(filename, "w"))
+   assert(fd:write(contents))
+   fd:close()
+end
+
+local function handling(args)
+   local pok, ret = pcall(args.try)
+   if not pok then
+      pok, ret = pcall(args.catch, ret)
+   end
+   args.finally()
+   if not pok then
+      error(ret)
+   end
+   return ret
+end
+
+function git_repo.start()
+   local dir = lfs.currentdir()
+   return handling {
+      try = function()
+         local pidfile = os.tmpname()
+         local basedir = test_env.testing_paths.testrun_dir .. "/git_repo"
+         local repodir = basedir .. "/testrock"
+         test_env.remove_dir(basedir)
+         lfs.mkdir(basedir)
+         lfs.mkdir(repodir)
+         lfs.chdir(repodir)
+         assert(test_env.execute("git init"))
+         for name, contents in pairs(files) do
+            write_file(name, contents)
+            test_env.execute("git add " .. name)
+         end
+         assert(test_env.execute("git commit -a -m 'initial commit'"))
+         print("git daemon --reuseaddr --pid-file="..pidfile.." --base-path="..basedir.." --export-all "..repodir.." &")
+         assert(test_env.execute("git daemon --reuseaddr --pid-file="..pidfile.." --base-path="..basedir.." --export-all "..repodir.." &"))
+         assert(test_env.execute("sleep 0.1; netstat -ln | grep '0.0.0.0:9418 .* LISTEN'"))
+         return {
+            stop = function()
+               local fd = io.open(pidfile)
+               local pid = fd:read("*a")
+               fd:close()
+               assert(test_env.execute("kill -HUP " .. pid))
+               test_env.remove_dir(basedir)
+            end
+         }
+      end,
+      catch = function(err)
+         error(err)
+      end,
+      finally = function()
+         lfs.chdir(dir)
+      end,
+   }
+end
+
+return git_repo
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 2232de87..e318128e 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -1,6 +1,7 @@
-local lfs = require("lfs")
 local test_env = {}
 
+local lfs = require("lfs")
+
 local help_message = [[
 LuaRocks test-suite
 
@@ -135,6 +136,11 @@ function test_env.execute_helper(command, print_command, env_variables)
    return final_command
 end
 
+function test_env.execute(cmd)
+   local ok = os.execute(cmd)
+   return (ok == true or ok == 0) -- normalize Lua 5.1 output to boolean
+end
+
 --- Execute command and returns true/false
 -- @return true/false boolean: status of the command execution
 local function execute_bool(command, print_command, env_variables)
@@ -147,8 +153,7 @@ local function execute_bool(command, print_command, env_variables)
       redirect = " > "..redirect_filename
       os.remove(redirect_filename)
    end
-   local ok = os.execute(command .. redirect)
-   ok = (ok == true or ok == 0) -- normalize Lua 5.1 output to boolean
+   local ok = test_env.execute(command .. redirect)
    if redirect ~= "" then
       if not ok then
          local fd = io.open(redirect_filename, "r")
@@ -530,9 +535,13 @@ function test_env.unload_luarocks()
          package.loaded[modname] = nil
       end
    end
+   local src_pattern = test_env.testing_paths.src_dir .. "/?.lua"
+   if not package.path:find(src_pattern, 1, true) then
+      package.path = src_pattern .. ";" .. package.path
+   end
 end
 
---- Function for initially setup of environment, variables, md5sums for spec files
+--- Function for initial setup of environment, variables, md5sums for spec files
 function test_env.setup_specs(extra_rocks)
    -- if global variable about successful creation of testing environment doesn't exist, build environment
    if not test_env.setup_done then
@@ -546,6 +555,10 @@ function test_env.setup_specs(extra_rocks)
       end
 
       test_env.main()
+      
+      -- preload before meddling with package.path
+      require("spec.util.git_repo")
+
       package.path = test_env.env_variables.LUA_PATH
 
       test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').arch)\"", false, test_env.env_variables)
@@ -744,9 +757,8 @@ function test_env.mock_server_extra_rocks(more)
 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"))
+   assert(test_env.need_rock("restserver-xavante"))
    local final_command = test_env.execute_helper(testing_paths.lua .. " " .. testing_paths.util_dir .. "/mock-server.lua &", true, test_env.env_variables)
    os.execute(final_command)
 end