From c8c5af5a7a53f015c2836d911511a8fec4676ff9 Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Thu, 14 May 2015 04:46:31 -0300
Subject: [PATCH] test: Ensure proper initialization in unit/helpers.lua

Remove helpers.vim_init and simply perform the required initialization in
helpers.lua.
---
 test/unit/buffer_spec.lua   | 2 --
 test/unit/helpers.lua       | 7 +------
 test/unit/os/env_spec.lua   | 3 ---
 test/unit/tempfile_spec.lua | 2 --
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/test/unit/buffer_spec.lua b/test/unit/buffer_spec.lua
index 5244c2af86..e0e2b827e9 100644
--- a/test/unit/buffer_spec.lua
+++ b/test/unit/buffer_spec.lua
@@ -3,8 +3,6 @@ local helpers = require("test.unit.helpers")
 local to_cstr = helpers.to_cstr
 local eq      = helpers.eq
 
-helpers.vim_init()
-
 local buffer = helpers.cimport("./src/nvim/buffer.h")
 local window = helpers.cimport("./src/nvim/window.h")
 local option = helpers.cimport("./src/nvim/option.h")
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 708e7a94ab..5bcc661226 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -136,15 +136,11 @@ end
 
 -- initialize some global variables, this is still necessary to unit test
 -- functions that rely on global state.
-local function vim_init()
-  if vim_init_called ~= nil then
-    return 
-  end
+do
   local main = cimport('./src/nvim/main.h')
   local time = cimport('./src/nvim/os/time.h')
   time.time_init()
   main.early_init()
-  vim_init_called = true
 end
 
 -- C constants.
@@ -167,7 +163,6 @@ return {
   lib = libnvim,
   cstr = cstr,
   to_cstr = to_cstr,
-  vim_init = vim_init,
   NULL = NULL,
   OK = OK,
   FAIL = FAIL
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index 9d936c2564..8e18c599d9 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -12,9 +12,6 @@ local NULL = helpers.NULL
 
 require('lfs')
 
--- Needed because expand_env_esc uses the char table
-helpers.vim_init()
-
 local env = cimport('./src/nvim/os/os.h')
 
 describe('env function', function()
diff --git a/test/unit/tempfile_spec.lua b/test/unit/tempfile_spec.lua
index 6484a98b8f..e558ff04c8 100644
--- a/test/unit/tempfile_spec.lua
+++ b/test/unit/tempfile_spec.lua
@@ -4,8 +4,6 @@ local helpers = require 'test.unit.helpers'
 local os = helpers.cimport './src/nvim/os/os.h'
 local tempfile = helpers.cimport './src/nvim/tempfile.h'
 
-helpers.vim_init()
-
 describe('tempfile related functions', function()
   after_each(function()
     tempfile.vim_deltempdir()