Merge from 3.x: PR #5027

spyder-ide · Aug 22, 2017 · 8af09a3 · 8af09a3
2 parents 4b41870 + 1006885
commit 8af09a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/spyder/plugins/tests/test_ipythonconsole.py b/spyder/plugins/tests/test_ipythonconsole.py
@@ -15,13 +15,13 @@
 from ipykernel.serialize import serialize_object
 from pygments.token import Name
 import pytest
-from qtpy import PYQT5, PYQT_VERSION
+from qtpy import PYQT4, PYQT5, PYQT_VERSION
 from qtpy.QtCore import Qt, QTimer
 from qtpy.QtWidgets import QApplication
 
 from spyder.config.gui import get_color_scheme
 from spyder.config.main import CONF
-from spyder.py3compat import PY2
+from spyder.py3compat import PY2, PY3
 from spyder.plugins.ipythonconsole import (IPythonConsole,
                                            KernelConnectionDialog)
 from spyder.utils.environ import listdict2envdict
@@ -426,7 +426,7 @@ def test_mpl_backend_change(ipyconsole, qtbot):
     assert shell._control.toHtml().count('img src') == 1
 
 
-@flaky(max_runs=3)
+@flaky(max_runs=10)
 @pytest.mark.skipif(os.name == 'nt', reason="It times out on Windows")
 def test_ctrl_c_dbg(ipyconsole, qtbot):
     """
@@ -452,7 +452,7 @@ def test_ctrl_c_dbg(ipyconsole, qtbot):
     assert 'For copying text while debugging, use Ctrl+Shift+C' in control.toPlainText()
 
 
-@flaky(max_runs=3)
+@flaky(max_runs=10)
 @pytest.mark.skipif(os.name == 'nt', reason="It doesn't work on Windows")
 def test_clear_and_reset_magics_dbg(ipyconsole, qtbot):
     """
@@ -563,7 +563,8 @@ def test_load_kernel_file_from_location(ipyconsole, qtbot):
 
 
 @flaky(max_runs=3)
-@pytest.mark.skipif(os.name == 'nt', reason="It times out on Windows")
+@pytest.mark.skipif(os.name == 'nt' or (PY3 and PYQT4),
+                    reason="It segfaults frequently")
 def test_load_kernel_file(ipyconsole, qtbot):
     """
     Test that a new client is created using the connection file

diff --git a/spyder/widgets/tests/test_pathmanager.py b/spyder/widgets/tests/test_pathmanager.py
@@ -12,9 +12,11 @@
 
 # Test library imports
 import pytest
+from qtpy import PYQT4
 from qtpy.QtCore import Qt
 
 # Local imports
+from spyder.py3compat import PY3
 from spyder.widgets.pathmanager import PathManager
 
 
@@ -27,6 +29,7 @@ def setup_pathmanager(qtbot, parent=None, pathlist=None, ro_pathlist=None,
     return widget
 
 
+@pytest.mark.skipif(PY3 and PYQT4, reason="It segfaults frequently")
 def test_pathmanager(qtbot):
     """Run PathManager test"""
     pathmanager = setup_pathmanager(qtbot, None, pathlist=sys.path[:-10],