1 files changed, 23 insertions, 10 deletions

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)