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

Minor changes and fixes for new test suite

28 files changed, 405 insertions, 469 deletions

diff --git a/.busted b/.busted
new file mode 100644
index 00000000..29a8137b
--- /dev/null
+++ b/.busted
@@ -0,0 +1,6 @@
+return {
+   default = {
+      helper = "test/test_environment",
+      ["auto-insulate"] = false
+   }
+}
diff --git a/.travis.yml b/.travis.yml
index c8755e7f..02bdb6c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,11 +40,7 @@ matrix:
 
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv -p python3; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi
-
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; fi
   - pip install hererocks
   - hererocks lua_install -r^ --$LUA
   - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH
@@ -53,17 +49,17 @@ install:
   - luarocks install busted
   - luarocks install luacov
   - luarocks install luacov-coveralls
-  
+
 script:
-  - busted -Xhelper travis,$LUA --verbose
-  - busted -Xhelper travis,$LUA,env=full --verbose
+  - busted -Xhelper travis --verbose
+  - busted -Xhelper travis,env=full --verbose
 
 after_success:
   - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/
-  - $PWD/lua_install/bin/luacov -c $TRAVIS_BUILD_DIR/test/luacov.config
+  - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config
   - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out
 
 notifications:
   email:
     on_success: change
-    on_failure: change
\ No newline at end of file
+    on_failure: change
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)
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 6de501fb..6de7a4e2 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -1,26 +1,38 @@
 local lfs = require("lfs")
 local test_env = {}
-local arg = arg or { ... }
+
+local help_message = [[
+LuaRocks test-suite
+
+INFORMATION
+   New test-suite for LuaRocks project, using unit testing framework Busted.
+REQUIREMENTS
+   Be sure sshd is running on your system, or use '--exclude-tags=ssh',
+   to not execute tests which require sshd.
+USAGE
+   busted [-Xhelper <arguments>]
+ARGUMENTS
+   env=<type>     Set type of environment to use ("minimal" or "full",
+                  default: "minimal").
+   clean          Remove existing testing environment.
+   travis         Add if running on TravisCI.
+   os=<type>      Set OS ("linux", "osx", or "windows").
+]]
 
 local function help()
-   print("LuaRocks test-suite\n\n"..
-         [[
-   INFORMATION
-      New test-suite for LuaRocks project, using unit testing framework Busted.
-   REQUIREMENTS
-      Tests require to have Lua installed and added to PATH. Be sure sshd is runnig on your system, or
-      use '--exclude-tags=ssh', to not execute tests which require sshd.
-   USAGE -Xhelper <arguments>
-      lua=<version> (mandatory) type your full version of Lua (e.g. --lua 5.2.4)
-      OR
-      luajit=<version> (mandatory) type your full version of LuaJIT (e.g. --luajit 2.0.3)
-
-      env=<type>   (default:"minimal") type what kind of environment to use ["minimal", "full"]
-      clean  remove existing testing environment
-      travis  add just if running on TravisCI
-      os=<version>    type your OS ["linux", "osx", "windows"]
-         ]]);
-      os.exit(1)
+   print(help_message)
+   os.exit(1)
+end
+
+local function title(str)
+   print()
+   print(("-"):rep(#str))
+   print(str)
+   print(("-"):rep(#str))
+end
+
+local function exists(path)
+   return lfs.attributes(path, "mode") ~= nil
 end
 
 --- Helper function for execute_bool and execute_output
@@ -70,54 +82,38 @@ local function execute_output(command, print_command, env_variables)
    return output:gsub("\n","") -- output adding new line, need to be removed
 end
 
---- Set all arguments from input into global variables
-function test_env.set_args()
-   if arg[1] == nil then
-      help()
-   end
-   
-   local args_position
-   
-   for i=1, #arg do
-      if arg[i]:find("-Xhelper") and arg[i+1]:find("lua=") and not arg[i+1]:find("luajit=") then
-         args_position = i+1
-         test_env.LUA_V = arg[args_position]:gsub("(.*)lua=([^%,]+)(.*)","%2")
-         break  
-      elseif arg[i]:find("-Xhelper") and not arg[i+1]:find("lua=") and arg[i+1]:find("luajit=") then
-         args_position = i+1
-         test_env.LUAJIT_V = arg[args_position]:gsub("(.*)luajit=([^%,]+)(.*)","%2")
-         break  
-      elseif arg[i]:find("-Xhelper") and arg[i+1]:find("lua=") and arg[i+1]:find("luajit=") then
-         print("Please specify just Lua or LuaJIT version for testing in format 'lua=X.X.X' or 'luajit=X.X.X', for -Xhelper flag")
-         os.exit(1)
-      elseif arg[i]:find("-Xhelper") and not arg[i+1]:find("lua=") and not arg[i+1]:find("luajit=") then
-         print("Please add mandatory argument - version of Lua or LuaJIT in format 'lua=X.X.X' or 'luajit=X.X.X', for -Xhelper flag")
-         os.exit(1)
-      end
-   end
-
-   if not args_position then
-      help()
+--- Set test_env.LUA_V or test_env.LUAJIT_V based
+-- on version of Lua used to run this script.
+function test_env.set_lua_version()
+   if _G.jit then
+      test_env.LUAJIT_V = _G.jit.version:match("(2%.%d)%.%d")
+   else
+      test_env.LUA_V = _VERSION:match("5%.%d")
    end
+end
 
+--- Set all arguments from input into global variables
+function test_env.set_args()
    -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables
    test_env.TYPE_TEST_ENV = "minimal"
 
-   if arg[args_position]:find("env=") then
-      test_env.TYPE_TEST_ENV = arg[args_position]:gsub("(.*)env=([^%,]+)(.*)","%2")
-   end
-   if arg[args_position]:find("clean") then
-      test_env.TEST_ENV_CLEAN = true
-   end
-   if arg[args_position]:find("travis") then
-      test_env.TRAVIS = true
-   end
-   if arg[args_position]:find("os=") then
-      test_env.TEST_TARGET_OS = arg[args_position]:gsub("(.*)os=([^%,]+)(.*)","%2")
+   for _, argument in ipairs(arg) do
+      if argument:find("^env=") then
+         test_env.TYPE_TEST_ENV = argument:match("^env=(.*)$")
+      elseif argument == "clean" then
+         test_env.TEST_ENV_CLEAN = true
+      elseif argument == "travis" then
+         test_env.TRAVIS = true
+      elseif argument:find("^os=") then
+         test_env.TEST_TARGET_OS = argument:match("^os=(.*)$")
+      else
+         help()
+      end
    end
 
    if not test_env.TEST_TARGET_OS then
-      print("[OS CHECK]")
+      title("OS CHECK")
+
       if execute_bool("sw_vers") then 
          test_env.TEST_TARGET_OS = "osx"
       elseif execute_bool("uname -s") then
@@ -125,7 +121,6 @@ function test_env.set_args()
       else
          test_env.TEST_TARGET_OS = "windows"
       end
-      print("--------------")
    end
    return true
 end
@@ -133,15 +128,13 @@ end
 --- Remove directory recursively
 -- @param path string: directory path to delete
 function test_env.remove_dir(path)
-   if lfs.attributes(path) then
+   if exists(path) then
       for file in lfs.dir(path) do
          if file ~= "." and file ~= ".." then
             local full_path = path..'/'..file
-            local attr = lfs.attributes(full_path)
 
-            if attr.mode == "directory" then
+            if lfs.attributes(full_path, "mode") == "directory" then
                test_env.remove_dir(full_path)
-               os.remove(full_path)
             else
                os.remove(full_path)
             end
@@ -151,32 +144,30 @@ function test_env.remove_dir(path)
    os.remove(path)
 end
 
---- Remove directory recursively
--- @param path string: directory path to delete
--- @param pattern string: pattern in directories
-function test_env.remove_dir_pattern(path, pattern)
-   if lfs.attributes(path) then
+--- Remove subdirectories of a directory that match a pattern
+-- @param path string: path to directory
+-- @param pattern string: pattern matching basenames of subdirectories to be removed
+function test_env.remove_subdirs(path, pattern)
+   if exists(path) then
       for file in lfs.dir(path) do
          if file ~= "." and file ~= ".." then
             local full_path = path..'/'..file
-            local attr = lfs.attributes(full_path)
 
-            if attr.mode == "directory" and file:find(pattern) then
+            if lfs.attributes(full_path, "mode") == "directory" and file:find(pattern) then
                test_env.remove_dir(full_path)
-               os.remove(full_path)
             end
          end
       end
    end
 end
 
---- Remove files based on filename
+--- Remove files matching a pattern
 -- @param path string: directory where to delete files
--- @param pattern string: pattern in filenames
+-- @param pattern string: pattern matching basenames of files to be deleted
 -- @return result_check boolean: true if one or more files deleted
 function test_env.remove_files(path, pattern)
    local result_check = false
-   if lfs.attributes(path) then
+   if exists(path) then
       for file in lfs.dir(path) do
          if file ~= "." and file ~= ".." then
             if file:find(pattern) then
@@ -192,51 +183,44 @@ end
 
 
 --- Function for downloading rocks and rockspecs
--- @param rocks table: table with full name of rocks/rockspecs to download
+-- @param urls table: array of full names of rocks/rockspecs to download
 -- @param save_path string: path to directory, where to download rocks/rockspecs
 -- @return make_manifest boolean: true if new rocks downloaded
-local function download_rocks(rocks, save_path)
+local function download_rocks(urls, save_path)
    local luarocks_repo = "https://luarocks.org"   
    local make_manifest = false
 
-   for _,rock in ipairs(rocks) do  
+   for _, url in ipairs(urls) do
       -- check if already downloaded
-      if not os.rename( save_path .. rock, save_path .. rock) then
-         execute_bool("wget -cP " .. save_path .. " " .. luarocks_repo .. rock)
+      if not exists(save_path .. url) then
+         execute_bool("wget -cP " .. save_path .. " " .. luarocks_repo .. url)
          make_manifest = true 
       end
    end
    return make_manifest
 end
 
---- Create config files for testing
--- @param config_path string: path where to save config file
--- @param config_content string: content of this config file
-local function create_config(config_path, config_content)
-   local file, err = io.open(config_path, "w+")
-   if not file then return nil, err end
-   file:write(config_content)
+--- Create a file containing a string.
+-- @param path string: path to file.
+-- @param str string: content of the file.
+local function write_file(path, str)
+   local file = assert(io.open(path, "w"))
+   file:write(str)
    file:close()
 end
 
 --- Create md5sum of directory structure recursively, based on filename and size
 -- @param path string: path to directory for generate md5sum
--- @param testing_os string(optional): version of PC OS
 -- @return md5sum string: md5sum of directory
-local function hash_environment(path, testing_os)
-   local md5sum = ""
-   testing_os = testing_os or test_env.TEST_TARGET_OS
-
-   if testing_os == "linux" then
-      md5sum = execute_output("find " .. path .. " -printf \"%s %p\n\" | md5sum")
-   end
-   if testing_os == "osx" then
-      md5sum = execute_output("find " .. path .. " -type f -exec stat -f \"%z %N\" {} \\; | md5")
+local function hash_environment(path)
+   if test_env.TEST_TARGET_OS == "linux" then
+      return execute_output("find " .. path .. " -printf \"%s %p\n\" | md5sum")
+   elseif test_env.TEST_TARGET_OS == "osx" then
+      return execute_output("find " .. path .. " -type f -exec stat -f \"%z %N\" {} \\; | md5")
+   else
+      -- TODO: Windows
+      return ""
    end
-   --TODO if testing_os == "windows" then
-   --    md5sum = execute_output("find . -printf \"%s %p\n\" | md5sum")
-   -- end
-   return md5sum
 end
 
 --- Create environment variables needed for tests
@@ -275,51 +259,48 @@ local function create_md5sums(testing_paths)
    return md5sums
 end
 
-local function run_luarocks(testing_paths, env_variables)
-   
-   local function make_command_function(exec_function, lua_cmd, do_print)
-      return function(cmd, new_vars)
-         local temp_vars = {}
-         for k, v in pairs(env_variables) do
+local function make_run_function(cmd_name, exec_function, with_coverage, do_print)
+   local cmd_prefix = test_env.testing_paths.lua .. " "
+
+   if with_coverage then
+      cmd_prefix = cmd_prefix .. "-e \"require('luacov.runner')('" .. test_env.testing_paths.testing_dir .. "/luacov.config')\" "
+   end
+
+   cmd_prefix = cmd_prefix .. test_env.testing_paths.src_dir .. "/bin/" .. cmd_name .. " "
+
+   return function(cmd, new_vars)
+      local temp_vars = {}
+      for k, v in pairs(test_env.env_variables) do
+         temp_vars[k] = v
+      end
+      if new_vars then
+         for k, v in pairs(new_vars) do
             temp_vars[k] = v
          end
-         if new_vars then
-            for k, v in pairs(new_vars) do
-               temp_vars[k] = v
-            end
-         end
-         return exec_function(lua_cmd .. cmd, do_print, temp_vars)
       end
+      return exec_function(cmd_prefix .. cmd, do_print, temp_vars)
    end
+end
 
-   local run = {}
-
-   local cov_str = testing_paths.lua .. " -e\"require('luacov.runner')('" .. testing_paths.testing_dir .. "/luacov.config')\" "
-
-   local luarocks_cmd = cov_str .. testing_paths.src_dir .. "/bin/luarocks "
-   run.luarocks = make_command_function(execute_output, luarocks_cmd, true)
-   run.luarocks_bool = make_command_function(execute_bool, luarocks_cmd, true)
-   run.luarocks_noprint = make_command_function(execute_bool, luarocks_cmd, false)
-
-   local luarocks_nocov_cmd = testing_paths.lua .. " " .. testing_paths.src_dir .. "/bin/luarocks "
-   run.luarocks_nocov = make_command_function(execute_bool, luarocks_nocov_cmd, true)
-   run.luarocks_noprint_nocov = make_command_function(execute_bool, luarocks_nocov_cmd, false)
-   
-   local luarocks_admin_cmd = cov_str .. testing_paths.src_dir .. "/bin/luarocks-admin "
-   run.luarocks_admin = make_command_function(execute_output, luarocks_admin_cmd, true)
-   run.luarocks_admin_bool = make_command_function(execute_bool, luarocks_admin_cmd, true)
-
-   local luarocks_admin_nocov_cmd = testing_paths.lua .. " " .. testing_paths.src_dir .. "/bin/luarocks-admin "
-   run.luarocks_admin_nocov = make_command_function(execute_bool, luarocks_admin_nocov_cmd, false)
-
-   return run
+local function make_run_functions()
+   return {
+      luarocks = make_run_function("luarocks", execute_output, true, true),
+      luarocks_bool = make_run_function("luarocks", execute_bool, true, true),
+      luarocks_noprint = make_run_function("luarocks", execute_bool, true, false),
+      luarocks_nocov = make_run_function("luarocks", execute_bool, false, true),
+      luarocks_noprint_nocov = make_run_function("luarocks", execute_bool, false, false),
+      luarocks_admin = make_run_function("luarocks-admin", execute_output, true, true),
+      luarocks_admin_bool = make_run_function("luarocks-admin", execute_bool, true, true),
+      luarocks_admin_nocov = make_run_function("luarocks-admin", execute_bool, false, false)
+   }
 end
 
---- Build environment for testing
-local function build_environment(env_rocks, testing_paths, env_variables)
-   print("\n--------------------")
-   print("BUILDING ENVIRONMENT")
-   print("--------------------")
+--- Rebuild environment.
+-- Remove old installed rocks and install new ones,
+-- updating manifests and tree copies.
+local function build_environment(rocks, env_variables)
+   title("BUILDING ENVIRONMENT")
+   local testing_paths = test_env.testing_paths
    test_env.remove_dir(testing_paths.testing_tree)
    test_env.remove_dir(testing_paths.testing_sys_tree)
    test_env.remove_dir(testing_paths.testing_tree_copy)
@@ -328,14 +309,14 @@ local function build_environment(env_rocks, testing_paths, env_variables)
    lfs.mkdir(testing_paths.testing_tree)
    lfs.mkdir(testing_paths.testing_sys_tree)
 
-   local run = run_luarocks(testing_paths, env_variables)
-   run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server)
-   run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_cache)
+   test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server)
+   test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_cache)
 
-   for _,package in ipairs(env_rocks) do
-      if not run.luarocks_nocov("install --only-server=" .. testing_paths.testing_cache .. " --tree=" .. testing_paths.testing_sys_tree .. " " .. package, env_variables) then
-         run.luarocks_nocov("build --tree=" .. testing_paths.testing_sys_tree .. " " .. package, env_variables)
-         run.luarocks_nocov("pack --tree=" .. testing_paths.testing_sys_tree .. " " .. package .. "; mv " .. package .. "-*.rock " .. testing_paths.testing_cache, env_variables)
+   for _, rock in ipairs(rocks) do
+      if not test_env.run.luarocks_nocov("install --only-server=" .. testing_paths.testing_cache .. " --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables) then
+         test_env.run.luarocks_nocov("build --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables)
+         test_env.run.luarocks_nocov("pack --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables)
+         execute_bool("mv " .. rock .. "-*.rock " .. testing_paths.testing_cache)
       end
    end
 
@@ -361,32 +342,11 @@ local function reset_environment(testing_paths, md5sums)
 end
 
 local function create_paths(luaversion_full)
-   local testing_paths = {}
-
-   testing_paths.luadir = ""
-
-   if test_env.TRAVIS then
-      testing_paths.luadir = lfs.currentdir() .. "/lua_install"
-      testing_paths.lua = testing_paths.luadir .. "/bin/lua"
-   end
+   local cfg = require("luarocks.cfg")
 
-   if test_env.LUA_V and not test_env.TRAVIS then
-      if lfs.attributes("/usr/bin/lua") then
-         testing_paths.luadir = "/usr"
-         testing_paths.lua = testing_paths.luadir .. "/bin/lua"
-      elseif lfs.attributes("/usr/local/bin/lua") then
-         testing_paths.luadir = "/usr/local"
-         testing_paths.lua = testing_paths.luadir .. "/bin/lua"
-      end
-   elseif test_env.LUAJIT_V and not test_env.TRAVIS then
-      if lfs.attributes("/usr/bin/luajit") then
-         testing_paths.luadir = "/usr"
-         testing_paths.lua = testing_paths.luadir .. "/bin/luajit"
-      elseif lfs.attributes("/usr/local/bin/luajit") then
-         testing_paths.luadir = "/usr/local"
-         testing_paths.lua = testing_paths.luadir .. "/bin/luajit"
-      end
-   end
+   local testing_paths = {}
+   testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "")
+   testing_paths.lua = cfg.variables.LUA_BINDIR .. "/" .. cfg.lua_interpreter
 
    testing_paths.luarocks_tmp = "/tmp/luarocks_testing" --windows?
 
@@ -415,13 +375,11 @@ function test_env.unload_luarocks()
 end
 
 --- Function for initially setup of environment, variables, md5sums for spec files
-function test_env.setup_specs(extra_rocks, luaversion_full)
+function test_env.setup_specs(extra_rocks)
    -- if global variable about successful creation of testing environment doesn't exists, build environment
    if not test_env.setup_done then
-      test_env.set_args()
-
       if test_env.TRAVIS then
-         if not os.rename(os.getenv("HOME") .. "/.ssh/id_rsa.pub", os.getenv("HOME") .. "/.ssh/id_rsa.pub") then
+         if not exists(os.getenv("HOME") .. "/.ssh/id_rsa.pub") then
             execute_bool("ssh-keygen -t rsa -P \"\" -f ~/.ssh/id_rsa")
             execute_bool("cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys")
             execute_bool("chmod og-wx ~/.ssh/authorized_keys")
@@ -429,197 +387,213 @@ function test_env.setup_specs(extra_rocks, luaversion_full)
          end
       end
 
-      luaversion_full = luaversion_full or test_env.LUA_V or test_env.LUAJIT_V
-
       test_env.main()
-
-      -- Set paths, env_vars and functions for specs
-      test_env.testing_paths = create_paths(luaversion_full)
-      test_env.env_variables = create_env(test_env.testing_paths)
       package.path = test_env.env_variables.LUA_PATH
 
-      test_env.run = run_luarocks(test_env.testing_paths, test_env.env_variables)
       test_env.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.cfg\").arch)'", false, test_env.env_variables)
       test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
+      title("RUNNING TESTS")
    end
    
    if extra_rocks then 
       local make_manifest = download_rocks(extra_rocks, test_env.testing_paths.testing_server)
       if make_manifest then
-         local run = run_luarocks(test_env.testing_paths, test_env.env_variables)
-         run.luarocks_admin_nocov("make_manifest " .. test_env.testing_paths.testing_server)
+         test_env.run.luarocks_admin_nocov("make_manifest " .. test_env.testing_paths.testing_server)
       end
    end
 
    reset_environment(test_env.testing_paths, test_env.md5sums, test_env.env_variables)
-
-   return true
 end
 
 --- Helper function for tests which needs luasocket installed
-function test_env.need_luasocket(luarocks_nocov, testing_cache, platform)
-   luarocks_nocov = luarocks_nocov or test_env.run.luarocks_nocov
-   testing_cache = testing_cache or test_env.testing_paths.testing_cache
-   platform = platform or test_env.platform
-
-   if luarocks_nocov("show luasocket") then
+function test_env.need_luasocket()
+   if test_env.run.luarocks_nocov("show luasocket") then
       return true
    else
-      testing_cache = testing_cache .. "/"
-      local luasocket_rock = "luasocket-3.0rc1-1." .. platform .. ".rock"
-      if not os.rename( testing_cache .. luasocket_rock, testing_cache .. luasocket_rock) then
-         luarocks_nocov("build --pack-binary-rock luasocket 3.0rc1-1")
+      local testing_cache = test_env.testing_paths.testing_cache .. "/"
+      local luasocket_rock = "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"
+      if not exists(testing_cache .. luasocket_rock) then
+         test_env.run.luarocks_nocov("build --pack-binary-rock luasocket 3.0rc1-1")
          os.rename(luasocket_rock, testing_cache .. luasocket_rock)
       end
-      luarocks_nocov("install " .. testing_cache .. luasocket_rock)
+      return test_env.run.luarocks_nocov("install " .. testing_cache .. luasocket_rock)
    end
-   return true
+end
+
+--- For each key-value pair in replacements table
+-- replace %{key} in given string with value.
+local function substitute(str, replacements)
+   return (str:gsub("%%%b{}", function(marker)
+      return replacements[marker:sub(3, -2)]
+   end))
+end
+
+
+--- Create configs for luacov and several versions of Luarocks
+-- configs needed for some tests.
+local function create_configs()
+   -- testing_config.lua and testing_config_show_downloads.lua
+   local config_content = substitute([[
+      rocks_trees = {
+         "%{testing_tree}",
+         { name = "system", root = "%{testing_sys_tree}" },
+      }
+      rocks_servers = {
+         "%{testing_server}"
+      }
+      local_cache = "%{testing_cache}"
+      upload_server = "testing"
+      upload_user = "%{user}"
+      upload_servers = {
+         testing = {
+            rsync = "localhost/tmp/luarocks_testing",
+         },
+      }
+      external_deps_dirs = {
+         "/usr/local",
+         "/usr",
+         -- These are used for a test that fails, so it
+         -- can point to invalid paths:
+         {
+            prefix = "/opt",
+            bin = "bin",
+            include = "include",
+            lib = { "lib", "lib64" },
+         }
+      }
+   ]], {
+      user = os.getenv("USER"),
+      testing_sys_tree = test_env.testing_paths.testing_sys_tree,
+      testing_tree = test_env.testing_paths.testing_tree,
+      testing_server = test_env.testing_paths.testing_server,
+      testing_cache = test_env.testing_paths.testing_cache
+   })
+
+   write_file(test_env.testing_paths.testing_dir .. "/testing_config.lua", config_content .. " \nweb_browser = \"true\"")
+   write_file(test_env.testing_paths.testing_dir .. "/testing_config_show_downloads.lua", config_content
+                  .. "show_downloads = true \n rocks_servers={\"http://luarocks.org/repositories/rocks\"}")
+
+   -- testing_config_sftp.lua
+   config_content = substitute([[
+      rocks_trees = {
+         "%{testing_tree}",
+         "%{testing_sys_tree}",
+      }
+      local_cache = "%{testing_cache}"
+      upload_server = "testing"
+      upload_user = "%{user}"
+      upload_servers = {
+         testing = {
+            sftp = "localhost/tmp/luarocks_testing",
+         },
+      }
+   ]], {
+      user = os.getenv("USER"),
+      testing_sys_tree = test_env.testing_paths.testing_sys_tree,
+      testing_tree = test_env.testing_paths.testing_tree,
+      testing_cache = test_env.testing_paths.testing_cache
+   })
+
+   write_file(test_env.testing_paths.testing_dir .. "/testing_config_sftp.lua", config_content)
+
+   -- luacov.config
+   config_content = substitute([[
+      return {
+         statsfile = "%{testing_dir}/luacov.stats.out",
+         reportfile = "%{testing_dir}/luacov.report.out",
+         modules = {
+            ["luarocks"] = "src/bin/luarocks",
+            ["luarocks-admin"] = "src/bin/luarocks-admin",
+            ["luarocks.*"] = "src",
+            ["luarocks.*.*"] = "src",
+            ["luarocks.*.*.*"] = "src"
+         }
+      }
+   ]], {
+      testing_dir = test_env.testing_paths.testing_dir
+   })
+
+   write_file(test_env.testing_paths.testing_dir .. "/luacov.config", config_content)
+end
+
+--- Remove testing directories.
+local function clean()
+   print("Cleaning testing directory...")
+   test_env.remove_dir(test_env.testing_paths.luarocks_tmp)
+   test_env.remove_subdirs(test_env.testing_paths.testing_dir, "testing[_%-]")
+   test_env.remove_files(test_env.testing_paths.testing_dir, "testing_")
+   test_env.remove_files(test_env.testing_paths.testing_dir, "luacov")
+   print("Cleaning done!")
+end
+
+--- Install luarocks into testing prefix.
+local function install_luarocks(install_env_vars)
+   -- Configure LuaRocks testing environment
+   local configure_cmd = "./configure --with-lua=" .. test_env.testing_paths.luadir ..
+      " --prefix=" .. test_env.testing_paths.testing_lrprefix ..
+      " && make clean"
+
+   assert(execute_bool(configure_cmd, false, install_env_vars))
+   assert(execute_bool("make src/luarocks/site_config.lua && make dev", false, install_env_vars))
 end
 
 ---
 -- Main function to create config files and testing environment 
-function test_env.main(luaversion_full, env_type, env_clean)
-   luaversion_full = luaversion_full or test_env.LUA_V or test_env.LUAJIT_V
-   local testing_paths = create_paths(luaversion_full)
-
-   env_clean = env_clean or test_env.TEST_ENV_CLEAN
-   if env_clean then
-      print("Cleaning testing directory...")
-      test_env.remove_dir(testing_paths.luarocks_tmp)
-      test_env.remove_dir_pattern(testing_paths.testing_dir, "testing_")
-      test_env.remove_dir_pattern(testing_paths.testing_dir, "testing-")
-      test_env.remove_files(testing_paths.testing_dir, "testing_")
-      test_env.remove_files(testing_paths.testing_dir, "luacov")
-      print("Cleaning done!")
+function test_env.main()
+   local testing_paths = test_env.testing_paths
+
+   if test_env.TEST_ENV_CLEAN then
+      clean()
    end
 
    lfs.mkdir(testing_paths.testing_cache)
    lfs.mkdir(testing_paths.luarocks_tmp)
 
---- CONFIG FILES
--- testing_config.lua and testing_config_show_downloads.lua
-   local config_content = ([[rocks_trees = {
-   "%{testing_tree}",
-   { name = "system", root = "%{testing_sys_tree}" },
-}
-rocks_servers = {
-   "%{testing_server}"
-}
-local_cache = "%{testing_cache}"
-upload_server = "testing"
-upload_user = "%{user}"
-upload_servers = {
-   testing = {
-      rsync = "localhost/tmp/luarocks_testing",
-   },
-}
-external_deps_dirs = {
-   "/usr/local",
-   "/usr",
-   -- These are used for a test that fails, so it
-   -- can point to invalid paths:
-   {
-      prefix = "/opt",
-      bin = "bin",
-      include = "include",
-      lib = { "lib", "lib64" },
-   }
-}]]):gsub("%%%b{}", {
-    ["%{user}"] = os.getenv("USER"),
-    ["%{testing_sys_tree}"] = testing_paths.testing_sys_tree,
-    ["%{testing_tree}"] = testing_paths.testing_tree,
-    ["%{testing_server}"] = testing_paths.testing_server,
-    ["%{testing_cache}"] = testing_paths.testing_cache})
-
-   create_config(testing_paths.testing_dir .. "/testing_config.lua", config_content .. " \nweb_browser = \"true\"")
-   create_config(testing_paths.testing_dir .. "/testing_config_show_downloads.lua", config_content
-                  .. "show_downloads = true \n rocks_servers={\"http://luarocks.org/repositories/rocks\"}")
+   create_configs()
 
--- testing_config_sftp.lua
-   config_content=([[rocks_trees = {
-   "%{testing_tree}",
-   "%{testing_sys_tree}",
-}
-local_cache = "%{testing_cache}"
-upload_server = "testing"
-upload_user = "%{user}"
-upload_servers = {
-   testing = {
-      sftp = "localhost/tmp/luarocks_testing",
-   },
-}]]):gsub("%%%b{}", {
-    ["%{user}"] = os.getenv("USER"),
-    ["%{testing_sys_tree}"] = testing_paths.testing_sys_tree,
-    ["%{testing_tree}"] = testing_paths.testing_tree,
-    ["%{testing_cache}"] = testing_paths.testing_cache})
-
-   create_config(testing_paths.testing_dir .. "/testing_config_sftp.lua", config_content)
-
--- luacov.config
-   config_content=([[return {
-   statsfile = "%{testing_dir}/luacov.stats.out",
-   reportfile = "%{testing_dir}/luacov.report.out",
-   modules = {
-      ["luarocks"] = "src/bin/luarocks",
-      ["luarocks-admin"] = "src/bin/luarocks-admin",
-      ["luarocks.*"] = "src",
-      ["luarocks.*.*"] = "src",
-      ["luarocks.*.*.*"] = "src"
+   local install_env_vars = {
+      LUAROCKS_CONFIG = test_env.testing_paths.testing_dir .. "/testing_config.lua",
+      LUA_PATH = "",
+      LUA_CPATH = ""
    }
-}]]):gsub("%%%b{}", {
-    ["%{testing_dir}"] = testing_paths.testing_dir})
-
-   create_config(testing_paths.testing_dir .. "/luacov.config", config_content)
 
-   -- Create environment variables for configuration
-   local temp_env_variables = {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config.lua",LUA_PATH="",LUA_CPATH=""}
-
-   -- Configure LuaRocks testing environment
-   local configure_cmd = "./configure --with-lua=" .. testing_paths.luadir .. " --prefix=" .. testing_paths.testing_lrprefix 
-   configure_cmd = configure_cmd .. " && make clean"
-   
-   if not execute_bool(configure_cmd, false, temp_env_variables) then
-      os.exit(1)
-   end
-   if not execute_bool("make src/luarocks/site_config.lua && make dev", false, temp_env_variables) then 
-      os.exit(1)
-   end
+   install_luarocks(install_env_vars)
 
    -- Preparation of rocks for building environment
-   env_type = env_type or test_env.TYPE_TEST_ENV
-   
-   local env_rocks = {} -- short names of rocks, required for building environment
-   local rocks = {}  -- full names of rocks required for download
-   rocks[#rocks+1] = "/luacov-0.11.0-1.rockspec"
-   rocks[#rocks+1] = "/luacov-0.11.0-1.src.rock"
-
-   if env_type == "full" then 
-      rocks[#rocks+1] = "/luafilesystem-1.6.3-1.src.rock"
-      rocks[#rocks+1] = "/luasocket-3.0rc1-1.src.rock"
-      rocks[#rocks+1] = "/luasocket-3.0rc1-1.rockspec"
-      rocks[#rocks+1] = "/luaposix-33.2.1-1.src.rock"
-      rocks[#rocks+1] = "/md5-1.2-1.src.rock"
-      rocks[#rocks+1] = "/lzlib-0.4.1.53-1.src.rock"
-      env_rocks = {"luafilesystem", "luasocket", "luaposix", "md5", "lzlib"}
-   end
-   if env_type == "full" and luaversion_full ~= "5.1.5" then
-      rocks[#rocks+1] = "/luabitop-1.0.2-1.rockspec"
-      rocks[#rocks+1] = "/luabitop-1.0.2-1.src.rock"
-      table.insert(env_rocks, "luabitop")
+   local rocks = {} -- names of rocks, required for building environment
+   local urls = {}  -- names of rock and rockspec files to be downloaded
+   table.insert(urls, "/luacov-0.11.0-1.rockspec")
+   table.insert(urls, "/luacov-0.11.0-1.src.rock")
+
+   if test_env.TYPE_TEST_ENV == "full" then
+      table.insert(urls, "/luafilesystem-1.6.3-1.src.rock")
+      table.insert(urls, "/luasocket-3.0rc1-1.src.rock")
+      table.insert(urls, "/luasocket-3.0rc1-1.rockspec")
+      table.insert(urls, "/luaposix-33.2.1-1.src.rock")
+      table.insert(urls, "/md5-1.2-1.src.rock")
+      table.insert(urls, "/lzlib-0.4.1.53-1.src.rock")
+      rocks = {"luafilesystem", "luasocket", "luaposix", "md5", "lzlib"}
+
+      if test_env.LUA_V ~= "5.1" then
+         table.insert(urls, "/luabitop-1.0.2-1.rockspec")
+         table.insert(urls, "/luabitop-1.0.2-1.src.rock")
+         table.insert(rocks, "luabitop")
+      end
    end
 
-   table.insert(env_rocks, "luacov")   -- luacov is needed for minimal or full environment
-   
+   table.insert(rocks, "luacov")   -- luacov is needed for minimal or full environment
+
    -- Download rocks needed for LuaRocks testing environment
    lfs.mkdir(testing_paths.testing_server)
-   download_rocks(rocks, testing_paths.testing_server)
-   
-   build_environment(env_rocks, testing_paths, temp_env_variables)
-
-   print("----------------")
-   print(" RUNNING  TESTS")
-   print("----------------")
+   download_rocks(urls, testing_paths.testing_server)
+   build_environment(rocks, install_env_vars)
 end
 
+test_env.set_lua_version()
+test_env.set_args()
+test_env.testing_paths = create_paths(test_env.LUA_V or test_env.LUAJIT_V)
+test_env.env_variables = create_env(test_env.testing_paths)
+test_env.run = make_run_functions()
+
 return test_env