tests(fetch): do not use restserver

2 files changed, 16 insertions, 1 deletions

diff --git a/spec/util/quick.lua b/spec/util/quick.lua
index 6b86bfa9..cb4bb4cf 100644
--- a/spec/util/quick.lua
+++ b/spec/util/quick.lua
@@ -429,7 +429,7 @@ function quick.compile(filename, env)
             end
          end
       end
-      write([=[ end) ]=])
+      write([=[ end, finally) ]=])
       write([=[ end ]=])
 
       local program = table.concat(code, "\n")
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 41787cb7..f311a370 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -193,10 +193,25 @@ function test_env.run_in_tmp(f, finally)
    lfs.mkdir(tmpdir)
    lfs.chdir(tmpdir)
 
+   if not finally then
+      error("run_in_tmp needs a finally argument")
+   end
+
+   -- for unit tests, so that current dir known by luarocks.fs (when running with non-lfs)
+   -- is synchronized with actual lfs (system) current dir
+   local fs = require("luarocks.fs")
+   if not fs.change_dir then
+      local cfg = require("luarocks.core.cfg")
+      cfg.init()
+      fs.init()
+   end
+   fs.change_dir(tmpdir)
+
    if finally then
       finally(function()
          lfs.chdir(olddir)
          lfs.rmdir(tmpdir)
+         fs.change_dir(olddir)
       end)
    end