From 2bf21d9f0e6963c6a0ea39de4679bb4842616c16 Mon Sep 17 00:00:00 2001 From: nvbn Date: Mon, 27 Jun 2016 23:48:06 +0300 Subject: [PATCH] #524: Wait for prompt in zsh tests --- tests/functional/test_zsh.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_zsh.py b/tests/functional/test_zsh.py index 68457bdf..9afe31c1 100644 --- a/tests/functional/test_zsh.py +++ b/tests/functional/test_zsh.py @@ -34,10 +34,15 @@ def proc(request, spawnu, run_without_docker): return proc +def wait_prompt(proc, TIMEOUT): + assert proc.expect([TIMEOUT, u'#']) + + @pytest.mark.functional -@pytest.mark.skip_without_docker +@pytest.mark.once_without_docker def test_with_confirmation(proc, TIMEOUT): with_confirmation(proc, TIMEOUT) + wait_prompt(proc, TIMEOUT) history_changed(proc, TIMEOUT, u'echo test') @@ -45,13 +50,15 @@ def test_with_confirmation(proc, TIMEOUT): @pytest.mark.once_without_docker def test_select_command_with_arrows(proc, TIMEOUT): select_command_with_arrows(proc, TIMEOUT) + wait_prompt(proc, TIMEOUT) history_changed(proc, TIMEOUT, u'git help') @pytest.mark.functional -@pytest.mark.skip_without_docker +@pytest.mark.once_without_docker def test_refuse_with_confirmation(proc, TIMEOUT): refuse_with_confirmation(proc, TIMEOUT) + wait_prompt(proc, TIMEOUT) history_not_changed(proc, TIMEOUT) @@ -59,6 +66,7 @@ def test_refuse_with_confirmation(proc, TIMEOUT): @pytest.mark.once_without_docker def test_without_confirmation(proc, TIMEOUT): without_confirmation(proc, TIMEOUT) + wait_prompt(proc, TIMEOUT) history_changed(proc, TIMEOUT, u'echo test')