mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reset XonshSession in teach main.py test

Browse source 
Unset builtins.__xonsh__ in shell fixture to make sure main.py tests
pass even if the XonshSession has not been touched by previous tests.

Also set $XONSH_CACHE_SCRIPTS in os.environ instead of
builtins.__xonsh__.env since it's not yet created.
This commit is contained in:
Jake Hedman 2018-11-13 21:59:48 +01:00
parent e9866478b4
commit cd730aef4f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/test_main.py
View file

@ -4,6 +4,7 @@ from __future__ import unicode_literals, print_function
from contextlib import contextmanager
import builtins
import os
import os.path
import sys
@ -21,6 +22,7 @@ def Shell(*args, **kwargs):
@pytest.fixture
def shell(xonsh_builtins, monkeypatch):
"""Xonsh Shell Mock"""
del builtins.__xonsh__
Shell.shell_type_aliases = {"rl": "readline"}
monkeypatch.setattr(xonsh.main, "Shell", Shell)
@ -54,7 +56,7 @@ def test_premain_D(shell):
def test_premain_custom_rc(shell, tmpdir, monkeypatch):
monkeypatch.setattr(sys.stdin, "isatty", lambda: True)
builtins.__xonsh__.env = Env(XONSH_CACHE_SCRIPTS=False)
monkeypatch.setitem(os.environ, "XONSH_CACHE_SCRIPTS", 'False')
f = tmpdir.join("wakkawakka")
f.write("print('hi')")
args = xonsh.main.premain(["--rc", f.strpath])
@ -72,11 +74,11 @@ def test_force_interactive_rc_with_script(shell, tmpdir):
assert builtins.__xonsh__.env.get("XONSH_INTERACTIVE")
def test_force_interactive_custom_rc_with_script(shell, tmpdir):
def test_force_interactive_custom_rc_with_script(shell, tmpdir, monkeypatch):
"""Calling a custom RC file on a script-call with the interactive flag
should run interactively
"""
builtins.__xonsh__.env = Env(XONSH_CACHE_SCRIPTS=False)
monkeypatch.setitem(os.environ, "XONSH_CACHE_SCRIPTS", 'False')
f = tmpdir.join("wakkawakka")
f.write("print('hi')")
args = xonsh.main.premain(["-i", "--rc", f.strpath, "tests/sample.xsh"])