Merge #7253 from justinmk/ci-travis

This commit is contained in:
Justin M. Keyes 2017-09-09 21:59:46 +02:00 committed by GitHub
commit d173d48177
2 changed files with 39 additions and 21 deletions

View File

@ -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
if command -v pip3 ; then
echo "Upgrade Python 3 pip."
pip3 -q install --user --upgrade pip
else
echo 'warning: missing pip3'
fi
fi

View File

@ -293,6 +293,7 @@ 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")
retry(2, 3 * screen.timeout, function()
-- Enter cmdline-mode.
feed_data(':')
screen:sleep(1)
@ -313,6 +314,7 @@ describe('tui FocusGained/FocusLost', function()
{3:-- TERMINAL --} |
]])
end)
end)
it('in terminal-mode', function()
feed_data(':set shell='..nvim_dir..'/shell-test\n')