From 6e460b16d98c0f423fb26c109437c4d8ca8842e4 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 26 Aug 2017 13:37:31 -0500 Subject: [PATCH 1/4] Testing: Increase waiting time for a test because it's failing too much --- spyder/plugins/tests/test_ipythonconsole.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spyder/plugins/tests/test_ipythonconsole.py b/spyder/plugins/tests/test_ipythonconsole.py index 61afea997f2..1fe4fda3741 100644 --- a/spyder/plugins/tests/test_ipythonconsole.py +++ b/spyder/plugins/tests/test_ipythonconsole.py @@ -448,7 +448,7 @@ def test_ctrl_c_dbg(ipyconsole, qtbot): # Test Ctrl+C qtbot.keyClick(control, Qt.Key_C, modifier=Qt.ControlModifier) - qtbot.wait(500) + qtbot.wait(3000) assert 'For copying text while debugging, use Ctrl+Shift+C' in control.toPlainText() From 01b083775802107356800d7db0ac5eaa1779490e Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 26 Aug 2017 13:38:02 -0500 Subject: [PATCH 2/4] Readme: Remove reference to our DMG installers because they are outdated --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e29f54bf166..cc59e75542b 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,6 @@ Using one (and only one) of these scientific Python distributions: ### On Mac OSX: -- Using our DMG installer, which can be found - [here](https://github.com/spyder-ide/spyder/releases). - Using the [Anaconda Distribution](http://continuum.io/downloads). - Through [MacPorts](http://www.macports.org/). From 64679201e1f7a617f2deac23cd98fa524b423fae Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 26 Aug 2017 13:59:08 -0500 Subject: [PATCH 3/4] Testing: Increase waiting time when entering %debug for all tests in the IPython console --- spyder/plugins/tests/test_ipythonconsole.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spyder/plugins/tests/test_ipythonconsole.py b/spyder/plugins/tests/test_ipythonconsole.py index 1fe4fda3741..78276bae83e 100644 --- a/spyder/plugins/tests/test_ipythonconsole.py +++ b/spyder/plugins/tests/test_ipythonconsole.py @@ -302,7 +302,7 @@ def test_values_dbg(ipyconsole, qtbot): with qtbot.waitSignal(shell.executed): shell.execute('1/0') shell.execute('%debug') - qtbot.wait(500) + qtbot.wait(1000) # Get value qtbot.keyClicks(control, '!aa = 10') @@ -348,7 +348,7 @@ def test_plot_magic_dbg(ipyconsole, qtbot): with qtbot.waitSignal(shell.executed): shell.execute('1/0') shell.execute('%debug') - qtbot.wait(500) + qtbot.wait(1000) # Test reset magic qtbot.keyClicks(control, '%plot plt.plot(range(10))') @@ -444,11 +444,11 @@ def test_ctrl_c_dbg(ipyconsole, qtbot): shell.execute('1/0') shell.execute('%debug') - qtbot.wait(500) + qtbot.wait(1000) # Test Ctrl+C qtbot.keyClick(control, Qt.Key_C, modifier=Qt.ControlModifier) - qtbot.wait(3000) + qtbot.wait(2000) assert 'For copying text while debugging, use Ctrl+Shift+C' in control.toPlainText() @@ -470,7 +470,7 @@ def test_clear_and_reset_magics_dbg(ipyconsole, qtbot): shell.execute('1/0') shell.execute('%debug') - qtbot.wait(500) + qtbot.wait(1000) # Test clear magic shell.clear_console() From 1a135ac3e4bce6f52c03e1aea544c4cacf5a2e80 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 26 Aug 2017 14:17:55 -0500 Subject: [PATCH 4/4] Testing: Increase flaky runs to 10 for all debugging tests --- spyder/plugins/tests/test_ipythonconsole.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spyder/plugins/tests/test_ipythonconsole.py b/spyder/plugins/tests/test_ipythonconsole.py index 78276bae83e..69a557d5c02 100644 --- a/spyder/plugins/tests/test_ipythonconsole.py +++ b/spyder/plugins/tests/test_ipythonconsole.py @@ -210,7 +210,7 @@ def test_get_syspath(ipyconsole, qtbot): pass -@flaky(max_runs=3) +@flaky(max_runs=10) @pytest.mark.skipif(os.name == 'nt', reason="It doesn't work on Windows") def test_browse_history_dbg(ipyconsole, qtbot): """Test that browsing command history is working while debugging.""" @@ -284,7 +284,7 @@ def test_read_stderr(ipyconsole, qtbot): assert content == client._read_stderr() -@flaky(max_runs=3) +@flaky(max_runs=10) @pytest.mark.skipif(True, reason="It times out too much (to check later)") def test_values_dbg(ipyconsole, qtbot): """ @@ -329,7 +329,7 @@ def test_values_dbg(ipyconsole, qtbot): assert "*** NameError: name 'aa' is not defined" 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_plot_magic_dbg(ipyconsole, qtbot): """Test our plot magic while debugging"""