Skip to content

Commit 7fb6af3

Browse files
committed
Testing: Skip some tests that definitively fail on CIs
1 parent 8e5a72f commit 7fb6af3

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

spyder/plugins/editor/widgets/codeeditor/tests/test_hints_and_calltips.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import pytest
1717

1818
# Local imports
19-
from spyder.config.base import running_in_ci, running_in_ci_with_conda
19+
from spyder.config.base import running_in_ci
2020
from spyder.plugins.editor.extensions.closebrackets import (
2121
CloseBracketsExtension
2222
)
@@ -214,11 +214,9 @@ def test_get_hints_not_triggered(qtbot, completions_codeeditor, text):
214214
@pytest.mark.skipif(
215215
(
216216
sys.platform == "darwin"
217-
or (
218-
sys.platform.startswith("linux") and not running_in_ci_with_conda()
219-
)
217+
or (sys.platform.startswith("linux") and running_in_ci())
220218
),
221-
reason="Fails on Linux with pip packages and Mac",
219+
reason="Fails on CIs for Linux and Mac",
222220
)
223221
@pytest.mark.parametrize(
224222
"params",
@@ -277,11 +275,9 @@ def test_get_hints_for_builtins(qtbot, completions_codeeditor, params):
277275
@pytest.mark.skipif(
278276
(
279277
sys.platform == "darwin"
280-
or (
281-
sys.platform.startswith("linux") and not running_in_ci_with_conda()
282-
)
278+
or (sys.platform.startswith("linux") and running_in_ci())
283279
),
284-
reason="Fails on Linux with pip packages and Mac",
280+
reason="Fails on CIs for Linux and Mac",
285281
)
286282
@pytest.mark.parametrize(
287283
"params",

0 commit comments

Comments
 (0)