Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add more tests for the main window #4110

Merged
merged 8 commits into from
Feb 10, 2017
Prev Previous commit
Next Next commit
Testing: Fix test in CIs
  • Loading branch information
ccordoba12 committed Feb 6, 2017
commit c0599daf315a453c6c1dbf39a30cfa9d06fc21d0
4 changes: 2 additions & 2 deletions spyder/config/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Local import
from spyder.config.base import (CHECK_ALL, EXCLUDED_NAMES, get_home_dir,
SUBFOLDER, TEST, PYTEST)
SUBFOLDER, TEST)
from spyder.config.fonts import BIG, MEDIUM, MONOSPACE, SANS_SERIF
from spyder.config.user import UserConfig
from spyder.config.utils import IMPORT_EXT
Expand Down Expand Up @@ -660,7 +660,7 @@

# Main configuration instance
try:
CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not (TEST or PYTEST)),
CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not TEST),
version=CONF_VERSION, subfolder=SUBFOLDER, backup=True,
raw_mode=True)
except:
Expand Down
5 changes: 2 additions & 3 deletions spyder/config/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@

# Local imports
from spyder.config.base import (get_conf_path, get_home_dir,
get_module_source_path, TEST,
PYTEST)
get_module_source_path, TEST)
from spyder.utils.programs import check_version
from spyder.py3compat import configparser as cp
from spyder.py3compat import PY2, is_text_string, to_text_string
Expand Down Expand Up @@ -91,7 +90,7 @@ def _save(self):
Save config into the associated .ini file
"""
# Don't save settings if we are on testing mode
if TEST or PYTEST:
if TEST:
return

# See Issue 1086 and 1242 for background on why this
Expand Down