Skip to content

Commit

Permalink
Testing: Set interface language by not relying in LANG
Browse files Browse the repository at this point in the history
That was generating some errors
  • Loading branch information
ccordoba12 committed Feb 12, 2018
1 parent 1410d4b commit 00aa30d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 0 additions & 3 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
# To activate/deactivate certain things for pytest's only
os.environ['SPYDER_PYTEST'] = 'True'

# Tests expect English as the interface language
os.environ['LANG'] = 'en'

# Remove temp conf_dir before starting the tests
from spyder.config.base import get_conf_path
conf_dir = get_conf_path()
Expand Down
4 changes: 4 additions & 0 deletions spyder/config/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ def get_interface_language():
except ValueError:
locale_language = DEFAULT_LANGUAGE

# Tests expect English as the interface language
if PYTEST:
locale_language = DEFAULT_LANGUAGE

language = DEFAULT_LANGUAGE

if locale_language is not None:
Expand Down

0 comments on commit 00aa30d

Please sign in to comment.