diff options
| -rwxr-xr-x | ci/before_install.sh | 20 | ||||
| -rw-r--r-- | test/functional/terminal/tui_spec.lua | 40 |
2 files changed, 39 insertions, 21 deletions
diff --git a/ci/before_install.sh b/ci/before_install.sh index 5b36adaef2..8b0603eb16 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -11,6 +11,18 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then brew update fi +echo 'python info:' +( + 2>&1 python --version || true + 2>&1 python2 --version || true + 2>&1 python3 --version || true + 2>&1 pip --version || true + 2>&1 pip2 --version || true + 2>&1 pip3 --version || true + echo 'pyenv versions:' + 2>&1 pyenv versions || true +) | sed 's/^/ /' + echo "Upgrade Python 2 pip." pip2.7 -q install --user --upgrade pip @@ -20,6 +32,10 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then echo "Upgrade Python 3 pip." pip3 -q install --user --upgrade pip else - echo "Upgrade Python 3 pip." - pip3 -q install --user --upgrade pip + if command -v pip3 ; then + echo "Upgrade Python 3 pip." + pip3 -q install --user --upgrade pip + else + echo 'warning: missing pip3' + fi fi diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 09b28589ac..d36eb46e54 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -293,25 +293,27 @@ describe('tui FocusGained/FocusLost', function() feed_data(":autocmd!\n") feed_data(":autocmd FocusLost * call append(line('$'), 'lost')\n") feed_data(":autocmd FocusGained * call append(line('$'), 'gained')\n") - -- Enter cmdline-mode. - feed_data(':') - screen:sleep(1) - -- Send focus lost/gained termcodes. - feed_data('\027[O') - feed_data('\027[I') - screen:sleep(1) - -- Exit cmdline-mode. Redraws from timers/events are blocked during - -- cmdline-mode, so the buffer won't be updated until we exit cmdline-mode. - feed_data('\n') - screen:expect([[ - {1: } | - lost | - gained | - {4:~ }| - {5:[No Name] [+] }| - : | - {3:-- TERMINAL --} | - ]]) + retry(2, 3 * screen.timeout, function() + -- Enter cmdline-mode. + feed_data(':') + screen:sleep(1) + -- Send focus lost/gained termcodes. + feed_data('\027[O') + feed_data('\027[I') + screen:sleep(1) + -- Exit cmdline-mode. Redraws from timers/events are blocked during + -- cmdline-mode, so the buffer won't be updated until we exit cmdline-mode. + feed_data('\n') + screen:expect([[ + {1: } | + lost | + gained | + {4:~ }| + {5:[No Name] [+] }| + : | + {3:-- TERMINAL --} | + ]]) + end) end) it('in terminal-mode', function() |