Tests: add test cases for rocks with conflicting module names

This tests the behavior of upgrades and downgrades on rocks that deploy both
foo.lua and foo.so

8 files changed, 159 insertions, 1 deletions

diff --git a/spec/fixtures/double_deploy_type/ddt.c b/spec/fixtures/double_deploy_type/ddt.c
new file mode 100644
index 00000000..f9050a4a
--- /dev/null
+++ b/spec/fixtures/double_deploy_type/ddt.c
@@ -0,0 +1,6 @@
+#include "lua.h"
+
+int luaopen_ddt(lua_State *L) {
+   lua_pushstring(L, "ddt.c");
+   return 1;
+}
diff --git a/spec/fixtures/double_deploy_type/ddt1.lua b/spec/fixtures/double_deploy_type/ddt1.lua
new file mode 100644
index 00000000..ea1dafed
--- /dev/null
+++ b/spec/fixtures/double_deploy_type/ddt1.lua
@@ -0,0 +1 @@
+return "ddt1"
diff --git a/spec/fixtures/double_deploy_type/ddt2.lua b/spec/fixtures/double_deploy_type/ddt2.lua
new file mode 100644
index 00000000..b1fa5d78
--- /dev/null
+++ b/spec/fixtures/double_deploy_type/ddt2.lua
@@ -0,0 +1 @@
+return "ddt2"
diff --git a/spec/fixtures/double_deploy_type/ddt_file b/spec/fixtures/double_deploy_type/ddt_file
new file mode 100644
index 00000000..988bbfb6
--- /dev/null
+++ b/spec/fixtures/double_deploy_type/ddt_file
@@ -0,0 +1 @@
+return "ddt_file"
diff --git a/spec/fixtures/double_deploy_type/double_deploy_type-0.1.0-1.rockspec b/spec/fixtures/double_deploy_type/double_deploy_type-0.1.0-1.rockspec
new file mode 100644
index 00000000..ff13df03
--- /dev/null
+++ b/spec/fixtures/double_deploy_type/double_deploy_type-0.1.0-1.rockspec
@@ -0,0 +1,22 @@
+package = "double_deploy_type"
+version = "0.1.0-1"
+source = {
+   url = "http://example.com"
+}
+description = {
+   homepage = "http://example.com",
+   license = "*** please specify a license ***"
+}
+dependencies = {}
+build = {
+   type = "builtin",
+   modules = {
+      ddt = "ddt/ddt.c"
+   },
+   install = {
+      lua = {
+         ddt = "ddt/ddt1.lua",
+         ddt_file = "ddt/ddt_file",
+      }
+   }
+}
diff --git a/spec/fixtures/double_deploy_type/double_deploy_type-0.2.0-1.rockspec b/spec/fixtures/double_deploy_type/double_deploy_type-0.2.0-1.rockspec
new file mode 100644
index 00000000..15f0c15c
--- /dev/null
+++ b/spec/fixtures/double_deploy_type/double_deploy_type-0.2.0-1.rockspec
@@ -0,0 +1,22 @@
+package = "double_deploy_type"
+version = "0.2.0-1"
+source = {
+   url = "http://example.com"
+}
+description = {
+   homepage = "http://example.com",
+   license = "*** please specify a license ***"
+}
+dependencies = {}
+build = {
+   type = "builtin",
+   modules = {
+      ddt = "ddt/ddt.c"
+   },
+   install = {
+      lua = {
+         ddt = "ddt/ddt2.lua",
+         ddt_file = "ddt/ddt_file",
+      }
+   }
+}
diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index 6df0ab23..0fc5cd93 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -109,6 +109,109 @@ describe("LuaRocks make tests #integration", function()
       end)
    end)
 
+   describe("#ddt LuaRocks make upgrading rockspecs with double deploy types", function()
+      local deploy_lib_dir = testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION
+      local deploy_lua_dir = testing_paths.testing_sys_tree .. "/share/lua/"..env_variables.LUA_VERSION
+      local so = test_env.lib_extension
+   
+      before_each(function()
+         test_env.copy_dir(testing_paths.fixtures_dir .. "/double_deploy_type", "ddt")
+      end)
+
+      after_each(function()
+         test_env.remove_dir("ddt")
+         os.remove("ddt."..test_env.lib_extension)
+      end)
+
+      it("when upgrading", function()
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.1.0-1.rockspec"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt1", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+  
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.2.0-1.rockspec"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt2", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+      end)
+
+      it("modules with same name from lua/ and lib/ when upgrading with --keep", function()
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.1.0-1.rockspec"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt1", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.2.0-1.rockspec --keep"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt2", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/double_deploy_type_0_1_0_1-ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/double_deploy_type_0_1_0_1-ddt.lua"))
+         assert.same("ddt1", loadfile(deploy_lua_dir.."/double_deploy_type_0_1_0_1-ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/double_deploy_type_0_1_0_1-ddt_file"))
+      end)
+
+      it("modules with same name from lua/ and lib/ when downgrading", function()
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.2.0-1.rockspec"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt2", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.1.0-1.rockspec"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt1", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+      end)
+
+      it("modules with same name from lua/ and lib/ when downgrading with --keep", function()
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.2.0-1.rockspec"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt2", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+
+         assert.is_true(run.luarocks_bool("make ddt/double_deploy_type-0.1.0-1.rockspec --keep"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt.lua"))
+         assert.same("ddt2", loadfile(deploy_lua_dir.."/ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/ddt_file"))
+         assert.is.falsy(lfs.attributes(deploy_lib_dir.."/ddt."..so.."~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt.lua~"))
+         assert.is.falsy(lfs.attributes(deploy_lua_dir.."/ddt_file~"))
+         assert.is.truthy(lfs.attributes(deploy_lib_dir.."/double_deploy_type_0_1_0_1-ddt."..so))
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/double_deploy_type_0_1_0_1-ddt.lua"))
+         assert.same("ddt1", loadfile(deploy_lua_dir.."/double_deploy_type_0_1_0_1-ddt.lua")())
+         assert.is.truthy(lfs.attributes(deploy_lua_dir.."/double_deploy_type_0_1_0_1-ddt_file"))
+      end)
+   end)
+
    describe("LuaRocks make upgrading rockspecs with mixed deploy types", function()
       before_each(function()
          test_env.copy_dir(testing_paths.fixtures_dir .. "/mixed_deploy_type", "mdt")
@@ -159,6 +262,8 @@ describe("LuaRocks make tests #integration", function()
          assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/mixed_deploy_type_0_1_0_1-mdt_file"))
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/share/lua/"..env_variables.LUA_VERSION.."/mdt.lua"))
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/share/lua/"..env_variables.LUA_VERSION.."/mdt_file"))
+         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/share/lua/"..env_variables.LUA_VERSION.."/mixed_deploy_type_0_1_0_1-mdt.lua"))
+         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/share/lua/"..env_variables.LUA_VERSION.."/mixed_deploy_type_0_1_0_1-mdt_file"))
       end)
 
       it("modules with same name from lua/ and lib/ when downgrading with --keep", function()
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index f43b55c6..cc9eb599 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -6,7 +6,7 @@ local testing_paths = test_env.testing_paths
 test_env.unload_luarocks()
 
 local extra_rocks = {
-   "/abelhas-1.1-1.rockspec",
+   "/abelhas-1.1-1.src.rock",
    "/copas-2.0.1-1.src.rock",
    "/coxpcall-1.16.0-1.src.rock",
    "/coxpcall-1.16.0-1.rockspec"