Skip to content

Commit

Permalink
fix more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Peter committed Jun 30, 2020
1 parent 1e73ff6 commit 7bc6561
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
36 changes: 18 additions & 18 deletions spyder/app/tests/test_mainwindow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ def test_move_to_first_breakpoint(main_window, qtbot, debugcell):
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')
# We need to press continue as we don't test yet if a breakpoint
# is in the cell
qtbot.keyClick(shell._control, 'c')
qtbot.keyClicks(shell._control, '!c')
qtbot.keyClick(shell._control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')
Expand Down Expand Up @@ -1251,7 +1251,7 @@ def test_run_code(main_window, qtbot, tmpdir):
modifier=Qt.AltModifier | Qt.ShiftModifier)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')
qtbot.keyClick(shell._control, 'c')
qtbot.keyClicks(shell._control, '!c')
qtbot.keyClick(shell._control, Qt.Key_Enter)

# Wait until the object has appeared in the variable explorer
Expand Down Expand Up @@ -1526,15 +1526,15 @@ def test_c_and_n_pdb_commands(main_window, qtbot):
qtbot.wait(500)

# Verify that c works
qtbot.keyClicks(control, 'c')
qtbot.keyClicks(control, '!c')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: nsb.editor.source_model.rowCount() == 1)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

# Verify that n works
qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: nsb.editor.source_model.rowCount() == 2)
Expand All @@ -1543,29 +1543,29 @@ def test_c_and_n_pdb_commands(main_window, qtbot):

# Verify that doesn't go to sitecustomize.py with next and stops
# the debugging session.
qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: nsb.editor.source_model.rowCount() == 3)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: 'In [2]:' in control.toPlainText())
Expand Down Expand Up @@ -1657,7 +1657,7 @@ def test_change_cwd_dbg(main_window, qtbot):
qtbot.wait(500)

# Get cwd in console
qtbot.keyClicks(control, '!import os; os.getcwd()')
qtbot.keyClicks(control, 'import os; os.getcwd()')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.wait(1000)

Expand Down Expand Up @@ -1693,7 +1693,7 @@ def test_varexp_magic_dbg(main_window, qtbot):

# Get to an object that can be plotted
for _ in range(2):
qtbot.keyClicks(control, 'n')
qtbot.keyClicks(control, '!n')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')
Expand Down Expand Up @@ -2319,7 +2319,7 @@ def test_break_while_running(main_window, qtbot, tmpdir):
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

# Continue debugging
qtbot.keyClick(shell._control, 'c')
qtbot.keyClicks(shell._control, '!c')
qtbot.keyClick(shell._control, Qt.Key_Enter)
qtbot.wait(500)

Expand All @@ -2330,7 +2330,7 @@ def test_break_while_running(main_window, qtbot, tmpdir):
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClick(shell._control, 'q')
qtbot.keyClicks(shell._control, '!q')
qtbot.keyClick(shell._control, Qt.Key_Enter)
qtbot.wait(500)

Expand Down Expand Up @@ -2883,11 +2883,11 @@ def test_runcell_pdb(main_window, qtbot):
# Start debugging
qtbot.mouseClick(debug_button, Qt.LeftButton)

for key in ['n', 'n', 's', 'n', 'n']:
for key in ['!n', '!n', '!s', '!n', '!n']:
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>',
timeout=3000)
qtbot.keyClick(shell._control, key)
qtbot.keyClicks(shell._control, key)
qtbot.keyClick(shell._control, Qt.Key_Enter)

qtbot.waitUntil(
Expand All @@ -2897,7 +2897,7 @@ def test_runcell_pdb(main_window, qtbot):
code_editor.setFocus()
# call runcell
qtbot.keyClick(code_editor, Qt.Key_Return, modifier=Qt.ShiftModifier)
qtbot.waitUntil(lambda: "!runcell" in shell._control.toPlainText())
qtbot.waitUntil(lambda: "runcell" in shell._control.toPlainText())
qtbot.waitUntil(
lambda: shell._control.toPlainText().split()[-1] == 'ipdb>')

Expand Down Expand Up @@ -2990,7 +2990,7 @@ def processEvents():
# Debug and open both files
shell.execute('%debug')
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'ipdb>')
qtbot.keyClick(control, 'u')
qtbot.keyClicks(control, '!u')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'ipdb>')

Expand Down Expand Up @@ -3048,7 +3048,7 @@ def test_pbd_step(main_window, qtbot, tmpdir):
str(test_file)))

# Go up and enter second file
qtbot.keyClick(control, 'u')
qtbot.keyClicks(control, '!u')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'ipdb>')
qtbot.waitUntil(
Expand Down
8 changes: 4 additions & 4 deletions spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1487,11 +1487,11 @@ def check_value(name, value):
test_file = tmpdir.join('test.py')
test_file.write('stuff\n')
# Set a breakpoint in the new file
qtbot.keyClicks(control, 'b ' + str(test_file) + ':1')
qtbot.keyClicks(control, '!b ' + str(test_file) + ':1')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'ipdb>')
# Check we can complete the breakpoint number
qtbot.keyClicks(control, 'ignore ')
qtbot.keyClicks(control, '!ignore ')
qtbot.keyClick(control, Qt.Key_Tab)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == '1')

Expand Down Expand Up @@ -1545,12 +1545,12 @@ def test_pdb_ignore_lib(ipyconsole, qtbot, show_lib):
shell.execute('%debug print()')
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClicks(control, 's')
qtbot.keyClicks(control, '!s')
qtbot.keyClick(control, Qt.Key_Enter)
qtbot.wait(500)
qtbot.waitUntil(lambda: control.toPlainText().split()[-1] == 'ipdb>')

qtbot.keyClicks(control, 'q')
qtbot.keyClicks(control, '!q')
qtbot.keyClick(control, Qt.Key_Enter)

if show_lib:
Expand Down

0 comments on commit 7bc6561

Please sign in to comment.