Tests: run our own local git-daemon repository for git tests

5 files changed, 219 insertions, 56 deletions

diff --git a/.travis.yml b/.travis.yml
index c4803b52..38fed55f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,8 +66,8 @@ script:
   - lua -v
   - ./configure --with-lua=lua_install
   - ./makedist scm
-  - busted -o gtest --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
-  - busted -o gtest --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
+  - busted -o gtest --exclude-tags=git --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
+  - busted -o gtest --exclude-tags=git --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
 
 after_success:
   - luacov -c $TRAVIS_BUILD_DIR/testrun/luacov.config
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index 59f73b57..5f518e4d 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -1,4 +1,5 @@
 local test_env = require("spec.util.test_env")
+local git_repo = require("spec.util.git_repo")
 
 test_env.unload_luarocks()
 local fetch = require("luarocks.fetch")
@@ -6,23 +7,35 @@ local vers = require("luarocks.vers")
 
 describe("Luarocks fetch test #whitebox #w_fetch", function()
    it("Fetch url to base dir", function()
-      assert.are.same("v0.3", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2/archive/v0.3.zip"))
-      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2.zip"))
-      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2.tar.gz"))
-      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2.tar.bz2"))
-      assert.are.same("parser.moon", fetch.url_to_base_dir("git://github.com/Cirru/parser.moon"))
-      assert.are.same("v0.3", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2/archive/v0.3"))
+      assert.are.same("v0.3", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2/archive/v0.3.zip"))
+      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2.zip"))
+      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2.tar.gz"))
+      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2.tar.bz2"))
+      assert.are.same("parser.moon", fetch.url_to_base_dir("git://example.com/Cirru/parser.moon"))
+      assert.are.same("v0.3", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2/archive/v0.3"))
    end)
 
-   describe("fetch_sources", function()
-      it("from Git", function()
+   describe("fetch_sources #unix #git", function()
+      local git
+
+      setup(function()
+         git = git_repo.start()
+      end)
+      
+      teardown(function()
+         if git then
+            git:stop()
+         end
+      end)
+
+      it("from #git", function()
          local rockspec = {
             format_is_at_least = vers.format_is_at_least,
             name = "testrock",
             version = "dev-1",
             source = {
                protocol = "git",
-               url = "git://github.com/luarocks/testrock",
+               url = "git://localhost:20000/testrock",
             },
             variables = {
                GIT = "git",
@@ -31,7 +44,7 @@ describe("Luarocks fetch test #whitebox #w_fetch", function()
          local pathname, tmpdir = fetch.fetch_sources(rockspec, false)
          assert.are.same("testrock", pathname)
          assert.match("luarocks_testrock%-dev%-1%-", tmpdir)
-         assert.match("^%d%d%d%d%d%d%d%d.%d%d%d%d%d%d.%x+$", rockspec.source.identifier)
+         assert.match("^%d%d%d%d%d%d%d%d.%d%d%d%d%d%d.%x+$", tostring(rockspec.source.identifier))
       end)
    end)
 
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
diff --git a/spec/write_rockspec_spec.lua b/spec/write_rockspec_spec.lua
index 9ee86ada..e4a7fa73 100644
--- a/spec/write_rockspec_spec.lua
+++ b/spec/write_rockspec_spec.lua
@@ -1,8 +1,9 @@
 local test_env = require("spec.util.test_env")
+local git_repo = require("spec.util.git_repo")
 local lfs = require("lfs")
 local run = test_env.run
 
-test_env.unload_luarocks()
+local extra_rocks = test_env.mock_server_extra_rocks()
 
 describe("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
 
@@ -10,63 +11,93 @@ describe("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
       test_env.setup_specs()
    end)
 
-   describe("LuaRocks write_rockspec basic tests", function()
-      it("LuaRocks write_rockspec with no flags/arguments", function()
-         assert.is_true(run.luarocks_bool("write_rockspec"))
-         os.remove("luarocks-dev-1.rockspec")
+   it("runs with no flags/arguments", function()
+      local d = lfs.currentdir()
+      finally(function()
+         os.remove("testrock-dev-1.rockspec")
+         lfs.chdir(d)
       end)
+      lfs.chdir("..")
+      assert.is_true(run.luarocks_bool("write_rockspec"))
+   end)
 
-      it("LuaRocks write_rockspec with invalid argument", function()
-         assert.is_false(run.luarocks_bool("write_rockspec invalid"))
+   it("fails with invalid argument", function()
+      assert.is_false(run.luarocks_bool("write_rockspec invalid"))
+   end)
+   
+   it("fails with invalid zip", function()
+      assert.is_false(run.luarocks_bool("write_rockspec http://example.com/invalid.zip"))
+   end)
+
+   describe("from #git #unix", function()
+      local git
+   
+      setup(function()
+         git = git_repo.start()
       end)
       
-      it("LuaRocks write_rockspec invalid zip", function()
-         assert.is_false(run.luarocks_bool("write_rockspec http://example.com/invalid.zip"))
+      teardown(function()
+         git:stop()
       end)
-   end)
 
-   describe("LuaRocks write_rockspec more complex tests", function()
-      it("LuaRocks write_rockspec git luarocks", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock"))
+      it("runs", function()
+         finally(function() os.remove("testrock-dev-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost:20000/testrock"))
          assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
-         assert.is_true(os.remove("testrock-dev-1.rockspec"))
       end)
       
-      it("LuaRocks write_rockspec git luarocks --tag=v2.3.0", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock --tag=v2.3.0"))
+      it("runs with --tag", function()
+         finally(function() os.remove("testrock-2.3.0-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost:20000/testrock --tag=v2.3.0"))
          assert.is.truthy(lfs.attributes("testrock-2.3.0-1.rockspec"))
-         assert.is_true(os.remove("testrock-2.3.0-1.rockspec"))
+         -- TODO check contents
       end)
       
-      it("LuaRocks write_rockspec git luarocks with format flag", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock --rockspec-format=1.1 --lua-version=5.1,5.2"))
+      it("runs with format flag", function()
+         finally(function() os.remove("testrock-dev-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost:20000/testrock --rockspec-format=1.1 --lua-version=5.1,5.2"))
          assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
-         assert.is_true(os.remove("testrock-dev-1.rockspec"))
+         -- TODO check contents
       end)
       
-      it("LuaRocks write_rockspec git luarocks with full flags", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock --lua-version=5.1,5.2 --license=\"MIT/X11\" "
+      it("runs with full flags", function()
+         finally(function() os.remove("testrock-dev-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost:20000/testrock --lua-version=5.1,5.2 --license=\"MIT/X11\" "
                                              .. " --homepage=\"http://www.luarocks.org\" --summary=\"A package manager for Lua modules\" "))
          assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
-         assert.is_true(os.remove("testrock-dev-1.rockspec"))
+         -- TODO check contents
       end)
-      
-      it("LuaRocks write_rockspec rockspec via http", function()
-         assert.is_true(run.luarocks_bool("write_rockspec http://luarocks.org/releases/luarocks-2.1.0.tar.gz --lua-version=5.1"))
-         assert.is.truthy(lfs.attributes("luarocks-2.1.0-1.rockspec"))
-         assert.is_true(os.remove("luarocks-2.1.0-1.rockspec"))
+
+      it("with various flags", function()
+         finally(function() os.remove("testrock-dev-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost:20000/testrock --lib=fcgi --license=\"3-clause BSD\" " .. "--lua-version=5.1,5.2"))
+         assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
+         -- TODO check contents
       end)
-      
-      it("LuaRocks write_rockspec base dir, luassert.tar.gz via https", function()
-         assert.is_true(run.luarocks_bool("write_rockspec https://github.com/downloads/Olivine-Labs/luassert/luassert-1.2.tar.gz --lua-version=5.1"))
-         assert.is.truthy(lfs.attributes("luassert-1.2-1.rockspec"))
-         assert.is_true(os.remove("luassert-1.2-1.rockspec"))
+   end)
+
+   describe("from tarball #mock", function()
+
+      setup(function()
+         test_env.setup_specs(extra_rocks)
+         test_env.mock_server_init()
       end)
-      
-      it("LuaRocks write_rockspec git luafcgi with many flags", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/arcapos/luafcgi --lib=fcgi --license=\"3-clause BSD\" " .. "--lua-version=5.1,5.2"))
-         assert.is.truthy(lfs.attributes("luafcgi-dev-1.rockspec")) -- TODO maybe read it content and find arguments from flags?
-         assert.is_true(os.remove("luafcgi-dev-1.rockspec"))
+      teardown(function()
+         test_env.mock_server_done()
+      end)
+
+      it("via http", function()
+         finally(function() os.remove("an_upstream_tarball-0.1-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec http://localhost:8080/file/an_upstream_tarball-0.1.tar.gz --lua-version=5.1"))
+         assert.is.truthy(lfs.attributes("an_upstream_tarball-0.1-1.rockspec"))
+         -- TODO check contents
+      end)
+
+      it("with a different basedir", function()
+         finally(function() os.remove("renamed_upstream_tarball-0.1-1.rockspec") end)
+         assert.is_true(run.luarocks_bool("write_rockspec http://localhost:8080/file/renamed_upstream_tarball-0.1.tar.gz --lua-version=5.1"))
+         assert.is.truthy(lfs.attributes("renamed_upstream_tarball-0.1-1.rockspec"))
+         -- TODO check contents
       end)
    end)
 end)