Add general improvements to the fs module

author: George Roman <george.roman.99@gmail.com> 2018-07-07 18:49:41 +0300
committer: Hisham Muhammad <hisham@gobolinux.org> 2018-07-16 20:34:30 -0300
commit: 4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e (patch)
tree: 9b5f36a8f75df296b1bace3413eb4967d9325729 /spec
parent: 1b3b6525a4313404af84fce0fbbc29695e664f73 (diff)
download: luarocks-4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e.tar.gz
luarocks-4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e.tar.bz2
luarocks-4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e.zip
2 files changed, 36 insertions, 34 deletions
diff --git a/spec/fs_spec.lua b/spec/fs_spec.lua
index eb8425e2..66453404 100644
--- a/spec/fs_spec.lua
+++ b/spec/fs_spec.lua
@@ -161,11 +161,19 @@ describe("Luarocks fs test #unit", function()
      it("does nothing if the argument is a file", function()
         tmpfile1 = get_tmp_path()
         create_file(tmpfile1)
-         assert.falsy(pcall(fs.dir_iterator, tmpfile1))
+         local crt = coroutine.create(fs.dir_iterator)
+         while coroutine.status(crt) ~= "dead" do
+            local ok, val = coroutine.resume(crt, tmpfile1)
+            assert.falsy(ok and res)
+         end
      end)
      it("does nothing if the argument is invalid", function()
-         assert.falsy(pcall(fs.dir_iterator, "/nonexistent"))
+         local crt = coroutine.create(fs.dir_iterator)
+         while coroutine.status(crt) ~= "dead" do
+            local ok, val = coroutine.resume(crt, "/nonexistent")
+            assert.falsy(ok and res)
+         end
      end)
   end)
   
@@ -530,11 +538,13 @@ describe("Luarocks fs test #unit", function()
         tmpdir = get_tmp_path()
         lfs.mkdir(tmpdir)
         assert.truthy(fs.change_dir(tmpdir))
-         local success = fs.change_dir_to_root()
+         assert.truthy(fs.change_dir_to_root())
-         if not is_win then
+         if is_win then
-            assert.truthy(success)
+            local curr_dir = fs.current_dir()
+            assert.truthy(curr_dir == "C:\\" or curr_dir == "/")
+         else
+            assert.same("/", fs.current_dir())
         end
-         assert.same("/", fs.current_dir())
      end)
      it("returns false and does nothing if the current directory is not valid #unix", function()
@@ -749,18 +759,14 @@ describe("Luarocks fs test #unit", function()
      end)
      
      it("does nothing if the argument is nonexistent", function()
-         assert.falsy(pcall(fs.list_dir("/nonexistent")))
+         assert.same(fs.list_dir("/nonexistent"), {})
      end)
      
      it("does nothing if the argument doesn't have the proper permissions", function()
         tmpdir = get_tmp_path()
         lfs.mkdir(tmpdir)
         make_unreadable(tmpdir)
-         if is_win then
+         assert.same(fs.list_dir(tmpdir), {})
-            assert.same(fs.list_dir(tmpdir), {})
-         else
-            assert.falsy(pcall(fs.list_dir, tmpdir))
-         end
      end)
   end)
@@ -1024,11 +1030,7 @@ describe("Luarocks fs test #unit", function()
         tmpdir = get_tmp_path()
         lfs.mkdir(tmpdir)
         make_unreadable(tmpdir)
-         if is_win then
+         assert.same(fs.find(tmpdir), {})
-            assert.same(fs.find(tmpdir), {})
-         else
-            assert.falsy(pcall(fs.find, tmpdir))
-         end
      end)
   end)
   
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index 55264a75..f43b55c6 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -7,9 +7,9 @@ test_env.unload_luarocks()
 local extra_rocks = {
   "/abelhas-1.1-1.rockspec",
-   "/lualogging-1.3.0-1.src.rock",
+   "/copas-2.0.1-1.src.rock",
-   "/luasocket-3.0rc1-2.src.rock",
+   "/coxpcall-1.16.0-1.src.rock",
-   "/luasocket-3.0rc1-2.rockspec"
+   "/coxpcall-1.16.0-1.rockspec"
 }
 describe("LuaRocks remove tests #integration", function()
@@ -52,38 +52,38 @@ describe("LuaRocks remove tests #integration", function()
   describe("LuaRocks remove more complex tests", function()
      before_each(function()
-         assert.is.truthy(test_env.need_rock("luasocket"))
+         assert.is.truthy(test_env.need_rock("coxpcall"))
      end)
      it("LuaRocks remove fail, break dependencies", function()
-         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/coxpcall"))
-         assert.is_true(run.luarocks_bool("build lualogging"))
+         assert.is_true(run.luarocks_bool("build copas"))
-         assert.is_false(run.luarocks_bool("remove luasocket"))
+         assert.is_false(run.luarocks_bool("remove coxpcall"))
-         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/coxpcall"))
      end)
      
      it("LuaRocks remove force", function()
-         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/coxpcall"))
-         assert.is_true(run.luarocks_bool("build lualogging"))
+         assert.is_true(run.luarocks_bool("build copas"))
-         local output = run.luarocks("remove --force luasocket")
+         local output = run.luarocks("remove --force coxpcall")
-         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket"))
+         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/coxpcall"))
         assert.is.truthy(output:find("Checking stability of dependencies"))
      end)
      
      it("LuaRocks remove force fast", function()
-         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/coxpcall"))
-         assert.is_true(run.luarocks_bool("build lualogging"))
+         assert.is_true(run.luarocks_bool("build copas"))
-         local output = run.luarocks("remove --force-fast luasocket")
+         local output = run.luarocks("remove --force-fast coxpcall")
-         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket"))
+         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/coxpcall"))
         assert.is.falsy(output:find("Checking stability of dependencies"))
      end)
   end)
   it("#admin remove #ssh", function()
-      assert.is_true(run.luarocks_admin_bool("--server=testing remove luasocket-3.0rc1-2.src.rock"))
+      assert.is_true(run.luarocks_admin_bool("--server=testing remove coxpcall-1.16.0-1.src.rock"))
   end)
   
   it("#admin remove missing", function()
author	George Roman <george.roman.99@gmail.com>	2018-07-07 18:49:41 +0300
committer	Hisham Muhammad <hisham@gobolinux.org>	2018-07-16 20:34:30 -0300
commit	4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e (patch)
tree	9b5f36a8f75df296b1bace3413eb4967d9325729 /spec
parent	1b3b6525a4313404af84fce0fbbc29695e664f73 (diff)
download	luarocks-4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e.tar.gz luarocks-4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e.tar.bz2 luarocks-4b3ee931cd8ecc5937811cd8e9316d79c0c9c00e.zip