Skip to content

Commit

Permalink
Merge from 5.x: PR #17095
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Dec 27, 2021
2 parents 80d3296 + 39ea000 commit bbe55ed
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions spyder/plugins/maininterpreter/widgets/tests/test_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@

# Local imports
from spyder.config.base import running_in_ci
from spyder.config.utils import is_anaconda
from spyder.plugins.statusbar.widgets.tests.test_status import status_bar
from spyder.plugins.maininterpreter.widgets.status import InterpreterStatus


@pytest.mark.skipif(not is_anaconda(), reason="Requires conda to be installed")
@pytest.mark.skipif(not running_in_ci(), reason="Only meant for CIs")
def test_status_bar_conda_interpreter_status(status_bar, qtbot):
"""Test status bar message with conda interpreter."""
Expand Down
4 changes: 4 additions & 0 deletions spyder/utils/tests/test_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

# Local imports
from spyder.config.base import running_in_ci
from spyder.config.utils import is_anaconda
from spyder.utils.conda import (
add_quotes, find_conda, get_conda_activation_script, get_conda_env_path,
get_conda_root_prefix, get_list_conda_envs, get_list_conda_envs_cache)


if not is_anaconda():
pytest.skip("Requires conda to be installed", allow_module_level=True)

if os.name == 'nt':
TEST_PYEXEC = 'c:/miniconda/envs/foobar/python.exe'
else:
Expand Down
5 changes: 5 additions & 0 deletions spyder/utils/tests/test_pyenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@
import pytest

from spyder.config.base import running_in_ci
from spyder.utils.programs import find_program
from spyder.utils.pyenv import get_list_pyenv_envs, get_list_pyenv_envs_cache


if not find_program('pyenv'):
pytest.skip("Requires pyenv to be installed", allow_module_level=True)


@pytest.mark.skipif(not running_in_ci(), reason="Only meant for CIs")
@pytest.mark.skipif(not sys.platform.startswith('linux'),
reason="Only runs on Linux")
Expand Down

0 comments on commit bbe55ed

Please sign in to comment.