Merge branch 'master' into luarocks-3

1 files changed, 8 insertions, 4 deletions

diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua
index 8db779c3..a0fc370d 100644
--- a/spec/unpack_spec.lua
+++ b/spec/unpack_spec.lua
@@ -1,14 +1,12 @@
 local test_env = require("test/test_environment")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
 
 local extra_rocks = {
    "/cprint-0.1-2.src.rock",
-   "/cprint-0.1-2.rockspec",
-   "/luazip-1.2.4-1.rockspec"
+   "/cprint-0.1-2.rockspec"
 }
 
 describe("LuaRocks unpack tests #blackbox #b_unpack", function()
@@ -21,9 +19,11 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function()
       it("LuaRocks unpack with no flags/arguments", function()
          assert.is_false(run.luarocks_bool("unpack"))
       end)
+      
       it("LuaRocks unpack with invalid rockspec", function()
          assert.is_false(run.luarocks_bool("unpack invalid.rockspec"))
       end)
+      
       it("LuaRocks unpack with invalid patch", function()
          assert.is_false(run.luarocks_bool("unpack " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec"))
       end)
@@ -34,19 +34,22 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function()
          assert.is_true(run.luarocks_bool("unpack cprint"))
          test_env.remove_dir("cprint-0.1-2")
       end)
+      
       it("LuaRocks unpack src", function()
          assert.is_true(run.luarocks_bool("download --source cprint"))
          assert.is_true(run.luarocks_bool("unpack cprint-0.1-2.src.rock"))
          os.remove("cprint-0.1-2.src.rock")
          test_env.remove_dir("cprint-0.1-2")
       end)
-      it("LuaRocks unpack rockspec", function()
+      
+      it("LuaRocks unpack src", function()
          assert.is_true(run.luarocks_bool("download --rockspec cprint"))
          assert.is_true(run.luarocks_bool("unpack cprint-0.1-2.rockspec"))
          os.remove("cprint-0.1-2.rockspec")
          os.remove("lua-cprint")
          test_env.remove_dir("cprint-0.1-2")
       end)
+
       -- #595 luarocks unpack of a git:// rockspec fails to copy the rockspec
       it("LuaRocks unpack git:// rockspec", function()
          assert.is_true(run.luarocks_bool("download --rockspec luazip"))
@@ -54,6 +57,7 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function()
          assert.is_truthy(lfs.attributes("luazip-1.2.4-1/luazip/luazip-1.2.4-1.rockspec"))
          test_env.remove_dir("luazip-1.2.4-1")
       end)
+
       it("LuaRocks unpack binary", function()
          assert.is_true(run.luarocks_bool("build cprint"))
          assert.is_true(run.luarocks_bool("pack cprint"))