Merge pull request #583 from mpeterv/adjust-new-tests

Minor changes and fixes for new test suite

25 files changed, 94 insertions, 134 deletions

diff --git a/spec/add_spec.lua b/spec/add_spec.lua
index e417f974..dca6f850 100644
--- a/spec/add_spec.lua
+++ b/spec/add_spec.lua
@@ -1,20 +1,18 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local add = require("luarocks.add")
 
 local extra_rocks = {
    "/luasocket-3.0rc1-1.src.rock",
    "/luasocket-3.0rc1-1.rockspec"
 }
 
-expose("LuaRocks add tests #blackbox #b_add", function()
+describe("LuaRocks add tests #blackbox #b_add", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    describe("LuaRocks-admin add tests", function()
@@ -43,4 +41,4 @@ expose("LuaRocks add tests #blackbox #b_add", function()
          assert.is_false(run.luarocks_admin_bool("--server=\"localhost@/tmp/luarocks_testing\" add " .. testing_paths.testing_server .. "luasocket-3.0rc1-1.src.rock"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 6665de0b..1ce99089 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -1,8 +1,9 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local build = require("luarocks.build")
 
 local extra_rocks = {
    "/lmathx-20120430.51-1.src.rock",
@@ -26,12 +27,10 @@ local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
 }
 
-expose("LuaRocks build tests #blackbox #b_build", function()
+describe("LuaRocks build tests #blackbox #b_build", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    describe("LuaRocks build - basic testing set", function()
diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index f6cabd8c..0dee8620 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -1,17 +1,17 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
+local site_config
 
 test_env.unload_luarocks()
-local cfg = require("luarocks.cfg")
 
-expose("LuaRocks config tests #blackbox #b_config", function()
+describe("LuaRocks config tests #blackbox #b_config", function()
    
    before_each(function()
-      test_env.setup_specs(extra_rocks)
+      test_env.setup_specs()
       test_env.unload_luarocks() -- need to be required here, because site_config is created after first loading of specs
       site_config = require("luarocks.site_config")
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    describe("LuaRocks config - basic tests", function()
@@ -87,4 +87,4 @@ expose("LuaRocks config tests #blackbox #b_config", function()
          test_env.remove_dir(testing_paths.testing_lrprefix)
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/deps_spec.lua b/spec/deps_spec.lua
index ce784080..c1bd404d 100644
--- a/spec/deps_spec.lua
+++ b/spec/deps_spec.lua
@@ -1,8 +1,9 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local deps = require("luarocks.deps")
 
 local extra_rocks = {
    "/lxsh-0.8.6-2.src.rock",
@@ -12,12 +13,10 @@ local extra_rocks = {
    "/lpeg-0.12-1.src.rock"
 }
 
-expose("LuaRocks deps tests #blackbox #b_deps", function()
+describe("LuaRocks deps tests #blackbox #b_deps", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    it("LuaRocks deps mode one", function()
@@ -112,4 +111,4 @@ expose("LuaRocks deps tests #blackbox #b_deps", function()
       assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh"))
       assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/doc_spec.lua b/spec/doc_spec.lua
index 476b8ea8..9dbeaab8 100644
--- a/spec/doc_spec.lua
+++ b/spec/doc_spec.lua
@@ -1,19 +1,16 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local doc = require("luarocks.doc")
 
 local extra_rocks = {
   "/luarepl-0.4-1.src.rock"
 }
 
-expose("LuaRocks doc tests #blackbox #b_doc", function()
+describe("LuaRocks doc tests #blackbox #b_doc", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    describe("LuaRocks doc basic tests", function()
diff --git a/spec/download_spec.lua b/spec/download_spec.lua
index 9b5d9e2e..320d9304 100644
--- a/spec/download_spec.lua
+++ b/spec/download_spec.lua
@@ -1,18 +1,17 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local download = require("luarocks.download")
 
 local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
 }
 
-expose("LuaRocks download tests #blackbox #b_download", function()
+describe("LuaRocks download tests #blackbox #b_download", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      run = test_env.run
    end)
 
    it("LuaRocks download with no flags/arguments", function()
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index 1f298733..05a709e4 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -1,5 +1,4 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
 
 test_env.unload_luarocks()
 local fetch = require("luarocks.fetch")
@@ -13,4 +12,4 @@ describe("Luarocks fetch test #whitebox #w_fetch", function()
       assert.are.same("parser.moon", fetch.url_to_base_dir("git://github.com/Cirru/parser.moon"))
       assert.are.same("v0.3", fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2/archive/v0.3"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/help_spec.lua b/spec/help_spec.lua
index 0f40dd38..0d41e2e9 100644
--- a/spec/help_spec.lua
+++ b/spec/help_spec.lua
@@ -1,14 +1,12 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local help = require("luarocks.help")
 
-expose("LuaRocks help tests #blackbox #b_help", function()
+describe("LuaRocks help tests #blackbox #b_help", function()
 
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    it("LuaRocks help with no flags/arguments", function()
@@ -26,4 +24,4 @@ expose("LuaRocks help tests #blackbox #b_help", function()
    it("LuaRocks-admin help with no flags/arguments", function()
       assert.is_true(run.luarocks_admin_bool("help"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 306bbbc1..0e406e22 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -1,8 +1,10 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
+local env_variables = test_env.env_variables
 
 test_env.unload_luarocks()
-local install = require("luarocks.install")
 
 local extra_rocks = {
    "/cprint-0.1-2.src.rock",
@@ -19,14 +21,10 @@ local extra_rocks = {
    "/wsapi-1.6-1.src.rock"
 }
 
-expose("LuaRocks install tests #blackbox #b_install", function()
+describe("LuaRocks install tests #blackbox #b_install", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      env_variables = test_env.env_variables
-      run = test_env.run
-      platform = test_env.platform
    end)
 
    describe("LuaRocks install - basic tests", function()
@@ -86,21 +84,21 @@ expose("LuaRocks install tests #blackbox #b_install", function()
       
       it("LuaRocks install only-deps of luasocket packed rock", function()
          assert.is_true(test_env.need_luasocket())
-         local output = run.luarocks("install --only-deps " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. platform .. ".rock")
+         local output = run.luarocks("install --only-deps " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock")
          assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-1")
       end)
 
       it("LuaRocks install binary rock of cprint", function()
          assert.is_true(test_env.need_luasocket())
          assert.is_true(run.luarocks_bool("build --pack-binary-rock cprint"))
-         assert.is_true(run.luarocks_bool("install cprint-0.1-2." .. platform .. ".rock"))
-         assert.is_true(os.remove("cprint-0.1-2." .. platform .. ".rock"))
+         assert.is_true(run.luarocks_bool("install cprint-0.1-2." .. test_env.platform .. ".rock"))
+         assert.is_true(os.remove("cprint-0.1-2." .. test_env.platform .. ".rock"))
       end)
 
       it("LuaRocks install reinstall", function()
          assert.is_true(test_env.need_luasocket())
-         assert.is_true(run.luarocks_bool("install " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. platform .. ".rock"))
-         assert.is_true(run.luarocks_bool("install --deps-mode=none " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. platform .. ".rock"))
+         assert.is_true(run.luarocks_bool("install " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+         assert.is_true(run.luarocks_bool("install --deps-mode=none " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
       end)
    end)
 
@@ -127,4 +125,4 @@ expose("LuaRocks install tests #blackbox #b_install", function()
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/say/1.0-1"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/lint_spec.lua b/spec/lint_spec.lua
index cba80a3e..f7496037 100644
--- a/spec/lint_spec.lua
+++ b/spec/lint_spec.lua
@@ -1,19 +1,17 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local lint = require("luarocks.lint")
 
 local extra_rocks = {
    "/validate-args-1.5.4-1.rockspec"
 }
 
-expose("LuaRocks lint tests #blackbox #b_lint", function()
+describe("LuaRocks lint tests #blackbox #b_lint", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    it("LuaRocks lint with no flags/arguments", function()
@@ -48,4 +46,4 @@ expose("LuaRocks lint tests #blackbox #b_lint", function()
          assert.is_false(run.luarocks_bool("lint " .. testing_paths.testing_dir .. "/testfiles/no_build_table-1.0-1.rockspec"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/list_spec.lua b/spec/list_spec.lua
index 545483df..1b082ab6 100644
--- a/spec/list_spec.lua
+++ b/spec/list_spec.lua
@@ -1,20 +1,18 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local list = require("luarocks.list")
 
 local extra_rocks = {
    "/say-1.0-1.src.rock",
    "/say-1.2-1.src.rock"
 }
 
-expose("LuaRocks list tests #blackbox #b_list", function()
+describe("LuaRocks list tests #blackbox #b_list", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      run = test_env.run
-      testing_paths = test_env.testing_paths
    end)
 
    it("LuaRocks list with no flags/arguments", function()
diff --git a/spec/make_manifest_spec.lua b/spec/make_manifest_spec.lua
index c6cb1328..1c7f5bf8 100644
--- a/spec/make_manifest_spec.lua
+++ b/spec/make_manifest_spec.lua
@@ -1,14 +1,12 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local make_manifest = require("luarocks.make_manifest")
 
-expose("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
+describe("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
         
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    describe("LuaRocks-admin make manifest tests", function()
@@ -16,4 +14,4 @@ expose("LuaRocks make_manifest tests #blackbox #b_make_manifest", function()
          assert.is_true(run.luarocks_admin_bool("make_manifest"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index f70bb7e9..2821c143 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -1,8 +1,9 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local make = require("luarocks.make")
 
 local extra_rocks = {
    "/lpeg-0.12-1.src.rock",
@@ -12,12 +13,10 @@ local extra_rocks = {
    "/lxsh-0.8.6-2.rockspec"
 }
 
-expose("LuaRocks make tests #blackbox #b_make", function()
+describe("LuaRocks make tests #blackbox #b_make", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      run = test_env.run
-      testing_paths = test_env.testing_paths
    end)
 
    it("LuaRocks make with no flags/arguments", function()
@@ -96,4 +95,4 @@ expose("LuaRocks make tests #blackbox #b_make", function()
          assert.is.truthy(lfs.attributes("lxsh-0.8.6-2.all.rock"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 57014226..2274bce3 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -1,19 +1,18 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local new_version = require("luarocks.new_version")
 
 local extra_rocks = {
    "/abelhas-1.0-1.rockspec"
 }
 
-expose("LuaRocks new_version tests #blackbox #b_new_version", function()
+describe("LuaRocks new_version tests #blackbox #b_new_version", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
    
    describe("LuaRocks new_version basic tests", function()
@@ -50,4 +49,4 @@ expose("LuaRocks new_version tests #blackbox #b_new_version", function()
          test_env.remove_files(lfs.currentdir(), "luacov--")
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua
index a07e7ed2..416184a8 100644
--- a/spec/pack_spec.lua
+++ b/spec/pack_spec.lua
@@ -1,8 +1,8 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local pack = require("luarocks.pack")
 
 local extra_rocks = {
         "/luasec-0.6-1.rockspec",
@@ -10,12 +10,10 @@ local extra_rocks = {
         "/luasocket-3.0rc1-1.rockspec"
 }
 
-expose("LuaRocks pack tests #blackbox #b_pack", function()
+describe("LuaRocks pack tests #blackbox #b_pack", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    it("LuaRocks pack basic", function()
diff --git a/spec/path_spec.lua b/spec/path_spec.lua
index 266ada89..22f07591 100644
--- a/spec/path_spec.lua
+++ b/spec/path_spec.lua
@@ -1,13 +1,11 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local path = require("luarocks.path")
 
-expose("LuaRocks path tests #blackbox #b_path", function()
+describe("LuaRocks path tests #blackbox #b_path", function()
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    it("LuaRocks path bin", function()
diff --git a/spec/purge_spec.lua b/spec/purge_spec.lua
index 639f96f3..09a9d433 100644
--- a/spec/purge_spec.lua
+++ b/spec/purge_spec.lua
@@ -1,14 +1,12 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local purge = require("luarocks.purge")
 
-expose("LuaRocks purge tests #blackbox #b_purge", function()   
+describe("LuaRocks purge tests #blackbox #b_purge", function()
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    describe("LuaRocks purge basic tests", function()
diff --git a/spec/refresh_cache_spec.lua b/spec/refresh_cache_spec.lua
index 27a95e5c..c20771ab 100644
--- a/spec/refresh_cache_spec.lua
+++ b/spec/refresh_cache_spec.lua
@@ -1,14 +1,12 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local refresh_cache = require("luarocks.refresh_cache")
 
-expose("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
+describe("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
         
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    describe("LuaRocks-admin refresh cache tests #ssh", function()
@@ -16,4 +14,4 @@ expose("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function()
          assert.is_true(run.luarocks_admin_bool("--server=testing refresh_cache"))
       end)
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index a94673a8..41c6348a 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -1,8 +1,9 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local remove = require("luarocks.remove")
 
 local extra_rocks = {
    "/abelhas-1.0-1.rockspec",
@@ -11,12 +12,10 @@ local extra_rocks = {
    "/luasocket-3.0rc1-1.rockspec"
 }
 
-expose("LuaRocks remove tests #blackbox #b_remove", function()
+describe("LuaRocks remove tests #blackbox #b_remove", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
    end)
 
    describe("LuaRocks remove basic tests", function()
@@ -82,4 +81,4 @@ expose("LuaRocks remove tests #blackbox #b_remove", function()
    it("LuaRocks-admin remove missing", function()
       assert.is_false(run.luarocks_admin_bool("--server=testing remove"))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/search_spec.lua b/spec/search_spec.lua
index a0258942..33c49856 100644
--- a/spec/search_spec.lua
+++ b/spec/search_spec.lua
@@ -1,18 +1,16 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local search = require("luarocks.search")
 
 local extra_rocks = {
 "/lzlib-0.4.1.53-1.src.rock"
 }
 
-expose("LuaRocks search tests #blackbox #b_search", function()
+describe("LuaRocks search tests #blackbox #b_search", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      run = test_env.run
    end)
 
    it("LuaRocks search with no flags/arguments", function()
@@ -39,4 +37,4 @@ expose("LuaRocks search tests #blackbox #b_search", function()
       local num = 123
       assert.is_true(run.luarocks_bool("search " .. num))
    end)
-end)
\ No newline at end of file
+end)
diff --git a/spec/show_spec.lua b/spec/show_spec.lua
index 85797eb6..f528a6de 100644
--- a/spec/show_spec.lua
+++ b/spec/show_spec.lua
@@ -1,14 +1,12 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local show = require("luarocks.show")
 
-expose("LuaRocks show tests #blackbox #b_show", function()
+describe("LuaRocks show tests #blackbox #b_show", function()
    
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    it("LuaRocks show with no flags/arguments", function()
diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua
index efe902f5..76e9e5a8 100644
--- a/spec/unpack_spec.lua
+++ b/spec/unpack_spec.lua
@@ -1,21 +1,18 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
-local unpack = require("luarocks.unpack")
 
 local extra_rocks = {
    "/cprint-0.1-2.src.rock",
    "/cprint-0.1-2.rockspec"
 }
 
-expose("LuaRocks unpack tests #blackbox #b_unpack", function()
+describe("LuaRocks unpack tests #blackbox #b_unpack", function()
    
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      run = test_env.run
-      platform = test_env.platform
    end)
 
    describe("LuaRocks unpack basic fail tests", function()
@@ -51,9 +48,9 @@ expose("LuaRocks unpack tests #blackbox #b_unpack", function()
       it("LuaRocks unpack binary", function()
          assert.is_true(run.luarocks_bool("build cprint"))
          assert.is_true(run.luarocks_bool("pack cprint"))
-         assert.is_true(run.luarocks_bool("unpack cprint-0.1-2." .. platform .. ".rock"))
+         assert.is_true(run.luarocks_bool("unpack cprint-0.1-2." .. test_env.platform .. ".rock"))
          test_env.remove_dir("cprint-0.1-2")
-         os.remove("cprint-0.1-2." .. platform .. ".rock")
+         os.remove("cprint-0.1-2." .. test_env.platform .. ".rock")
       end)
    end)
 end)
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index daf40d61..c10ef0e9 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -1,18 +1,16 @@
 local test_env = require("test/test_environment")
-local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local upload = require("luarocks.upload")
 
 local extra_rocks = {
    "/lua-cjson-2.1.0-1.src.rock"
 }
 
-expose("LuaRocks upload tests #blackbox #b_upload", function()
+describe("LuaRocks upload tests #blackbox #b_upload", function()
 
    before_each(function()
       test_env.setup_specs(extra_rocks)
-      run = test_env.run
    end)
 
    it("LuaRocks upload with no flags/arguments", function()
diff --git a/spec/util_spec.lua b/spec/util_spec.lua
index 7c22d1cb..9118ffc9 100644
--- a/spec/util_spec.lua
+++ b/spec/util_spec.lua
@@ -1,13 +1,13 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
+local env_variables = test_env.env_variables
 
-expose("Basic tests #blackbox #b_util", function()
+describe("Basic tests #blackbox #b_util", function()
 
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      testing_paths = test_env.testing_paths
-      env_variables = test_env.env_variables
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    it("LuaRocks version", function()
diff --git a/spec/write_rockspec_spec.lua b/spec/write_rockspec_spec.lua
index d6e32f15..85e345d5 100644
--- a/spec/write_rockspec_spec.lua
+++ b/spec/write_rockspec_spec.lua
@@ -1,14 +1,13 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
+local run = test_env.run
 
 test_env.unload_luarocks()
-local write_rockspec = require("luarocks.write_rockspec")
 
-expose("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
+describe("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
 
    before_each(function()
-      test_env.setup_specs(extra_rocks)
-      run = test_env.run
+      test_env.setup_specs()
    end)
 
    describe("LuaRocks write_rockspec basic tests", function()
@@ -71,4 +70,4 @@ expose("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
          assert.is_true(os.remove("luafcgi-scm-1.rockspec"))
       end)
    end)
-end)
\ No newline at end of file
+end)