From 5d34b03293d7bbdc3376fc04c02634eaca7f6df7 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Tue, 26 Jun 2018 08:46:22 -0300
Subject: Tests: config: no need for special-casing Windows

---
 spec/config_spec.lua | 56 +++++++++++++++++++---------------------------------
 spec/fetch_spec.lua  |  1 -
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index e78c3de0..825245b7 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -22,20 +22,12 @@ describe("LuaRocks config tests #integration", function()
       
       it("LuaRocks config include dir", function()
          local output = run.luarocks("config --lua-incdir")
-         if test_env.TEST_TARGET_OS == "windows" then
-            assert.are.same(output, hardcoded.LUA_INCDIR:gsub("\\","/"))
-         else
-            assert.are.same(output, hardcoded.LUA_INCDIR)
-         end
+         assert.are.same(hardcoded.LUA_INCDIR, output)
       end)
       
       it("LuaRocks config library dir", function()
          local output = run.luarocks("config --lua-libdir")
-         if test_env.TEST_TARGET_OS == "windows" then
-            assert.are.same(output, hardcoded.LUA_LIBDIR:gsub("\\","/"))
-         else
-            assert.are.same(output, hardcoded.LUA_LIBDIR)
-         end
+         assert.are.same(hardcoded.LUA_LIBDIR, output)
       end)
       
       it("LuaRocks config lua version", function()
@@ -44,7 +36,7 @@ describe("LuaRocks config tests #integration", function()
          if test_env.LUAJIT_V then
             lua_version = "5.1"
          end
-         assert.are.same(output, lua_version)
+         assert.are.same(lua_version, output)
       end)
       
       it("LuaRocks config rock trees", function()
@@ -68,8 +60,10 @@ describe("LuaRocks config tests #integration", function()
 
       it("LuaRocks fail system config", function()
          os.rename(configfile, configfile .. ".bak")
+         finally(function()
+            os.rename(configfile .. ".bak", configfile)
+         end)
          assert.is_false(run.luarocks_bool("config --system-config"))
-         os.rename(configfile .. ".bak", configfile)
       end)
       
       it("LuaRocks system config", function()
@@ -77,18 +71,15 @@ describe("LuaRocks config tests #integration", function()
          lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/")
          lfs.mkdir(scdir)
 
-         if test_env.TEST_TARGET_OS == "windows" then
-            local output = run.luarocks("config --system-config")
-            assert.are.same(output, configfile)
-         else
-            local sysconfig = io.open(configfile, "w+")
-            sysconfig:write(" ")
-            sysconfig:close()
-            
-            local output = run.luarocks("config --system-config")
-            assert.are.same(output, configfile)
+         local sysconfig = io.open(configfile, "w+")
+         sysconfig:write(" ")
+         sysconfig:close()
+         finally(function()
             os.remove(configfile)
-         end
+         end)
+         
+         local output = run.luarocks("config --system-config")
+         assert.are.same(configfile, output)
       end)
       
       it("LuaRocks fail system config invalid", function()
@@ -96,20 +87,13 @@ describe("LuaRocks config tests #integration", function()
          lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/")
          lfs.mkdir(scdir)
 
-         if test_env.TEST_TARGET_OS == "windows" then
-            test_env.copy(configfile, "configfile_temp")
-            local sysconfig = io.open(configfile, "w+")
-            sysconfig:write("if if if")
-            sysconfig:close()
-            assert.is_false(run.luarocks_bool("config --system-config"))
-            test_env.copy("configfile_temp", configfile)
-         else
-            local sysconfig = io.open(configfile, "w+")
-            sysconfig:write("if if if")
-            sysconfig:close()
-            assert.is_false(run.luarocks_bool("config --system-config"))
+         local sysconfig = io.open(configfile, "w+")
+         sysconfig:write("if if if")
+         sysconfig:close()
+         finally(function()
             os.remove(configfile)
-         end
+         end)
+         assert.is_false(run.luarocks_bool("config --system-config"))
       end)
    end)
 end)
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index 83797480..cca4fbc7 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -4,7 +4,6 @@ local git_repo = require("spec.util.git_repo")
 test_env.unload_luarocks()
 test_env.setup_specs()
 local cfg = require("luarocks.core.cfg")
-local fs = require("luarocks.fs")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
-- 
cgit v1.2.3-55-g6feb