Skip to content

Commit

Permalink
Fix macOS test failure.
Browse files Browse the repository at this point in the history
zsh does not have -u shell option. macOS can use bash instead of zsh, alternatively, -u option can be removed from bash_example.sh.
  • Loading branch information
mrclary committed Feb 17, 2023
1 parent d7de4de commit a82102a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions spyder/app/tests/test_mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def ns_fun(main_window, qtbot):
and shell._prompt_html is not None
),
timeout=SHELL_TIMEOUT)

# Count initial objects
# Only one of each should be present, but because of many leaks,
# this is most likely not the case. Here only closing is tested
Expand All @@ -159,15 +159,15 @@ def ns_fun(main_window, qtbot):
for o in objects:
if type(o).__name__ == "ShellWidget":
n_shell_init += 1

# Open a second file and console
main_window.editor.new()
main_window.ipyconsole.create_new_client()
# Do something interesting in the new window
code_editor = main_window.editor.get_focus_widget()
# Show an error in the editor
code_editor.set_text("aaa")

shell = main_window.ipyconsole.get_current_shellwidget()
qtbot.waitUntil(
lambda: (
Expand All @@ -177,7 +177,7 @@ def ns_fun(main_window, qtbot):
timeout=SHELL_TIMEOUT)
with qtbot.waitSignal(shell.executed):
shell.execute("%debug print()")

# Close all files and consoles
main_window.editor.close_all_files()
main_window.ipyconsole.restart()
Expand Down Expand Up @@ -863,16 +863,13 @@ def test_dedicated_consoles(main_window, qtbot):

@flaky(max_runs=3)
@pytest.mark.order(after="test_dedicated_consoles")
@pytest.mark.skipif(sys.platform == 'darwin', reason='Fails on Mac')
def test_shell_execution(main_window, qtbot, tmpdir):
"""Test that bash/batch files can be executed."""
ext = 'sh'
script = 'bash_example.sh'
interpreter = 'bash'
opts = ''
if sys.platform == 'darwin':
interpreter = 'zsh'
elif os.name == 'nt':
if os.name == 'nt':
interpreter = find_program('cmd.exe')
script = 'batch_example.bat'
ext = 'bat'
Expand Down

0 comments on commit a82102a

Please sign in to comment.