From 2c6fb2e6f784768315a302e1700fe2e97840e684 Mon Sep 17 00:00:00 2001
From: Konstantinos Tsakiltzidis <laerusk@gmail.com>
Date: Sat, 25 Jun 2016 13:38:43 +0300
Subject: [PATCH] 'need more fixtures'

---
 tests/TODO.txt         |  1 +
 tests/test_contexts.py |  4 +---
 tests/tools.py         | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/TODO.txt b/tests/TODO.txt
index 538e8537b..9b851ba13 100644
--- a/tests/TODO.txt
+++ b/tests/TODO.txt
@@ -2,6 +2,7 @@ tools.py
 --------
 - maybe make stub Execer a fixture
   for (text_execer, test_ast, test_context)
+- decouple check_exec, check_eval, check_parse from xonsh_env
 
 test_tools.py
 -------------
diff --git a/tests/test_contexts.py b/tests/test_contexts.py
index a15b6408e..426a45380 100644
--- a/tests/test_contexts.py
+++ b/tests/test_contexts.py
@@ -1,7 +1,5 @@
 """Tests xonsh contexts."""
-from tools import (mock_xonsh_env, execer_setup, check_exec, check_eval,
-    check_parse)
-
+from tools import (execer_setup, check_exec, check_eval, check_parse)
 from xonsh.contexts import Block, Functor
 
 #
diff --git a/tests/tools.py b/tests/tools.py
index ca9dc34f2..fd2e21d89 100644
--- a/tests/tools.py
+++ b/tests/tools.py
@@ -75,12 +75,12 @@ def execer_setup():
     if EXECER is None:
         EXECER = Execer(debug_level=DEBUG_LEVEL, login=False)
 
-def check_exec(input, **kwargs):
-    with mock_xonsh_env(None):
-        if not input.endswith('\n'):
-            input += '\n'
-        EXECER.debug_level = DEBUG_LEVEL
-        EXECER.exec(input, **kwargs)
+def check_exec(input, xonsh_env, **kwargs):
+    # with mock_xonsh_env(None):
+    if not input.endswith('\n'):
+        input += '\n'
+    EXECER.debug_level = DEBUG_LEVEL
+    EXECER.exec(input, **kwargs)
 
 def check_eval(input):
     env = {'AUTO_CD': False, 'XONSH_ENCODING' :'utf-8',