-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Install more python versions in the linux VM so we can test epoll.c too.
Also fix a bug in the test for python 2.5 on systems where ipv6 is not configured (socket.gaierror didn't have an `errno` attribute until 2.6)
- Loading branch information
Showing
4 changed files
with
52 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,50 @@ | ||
#!/bin/sh | ||
|
||
set -e | ||
|
||
apt-get update | ||
|
||
# libcurl4-gnutls-dev is the default if you ask for libcurl4-dev, but it | ||
# has bugs that make our tests deadlock (the relevant tests detect this and | ||
# disable themselves, but it means that to get full coverage we have to use | ||
# the openssl version) | ||
# the openssl version). | ||
# The oddly-named python-software-properties includes add-apt-repository. | ||
APT_PACKAGES=" | ||
python-pip | ||
python-virtualenv | ||
python-dev | ||
libmysqlclient-dev | ||
libcurl4-openssl-dev | ||
python-software-properties | ||
" | ||
|
||
apt-get -y install $APT_PACKAGES | ||
|
||
|
||
# Ubuntu 10.04 has python 2.6 as default; install more from here. | ||
# The most important thing is to have both 2.5 and a later version so we | ||
# test with both tornado.epoll and 2.6+ stdlib's select.epoll. | ||
add-apt-repository ppa:fkrull/deadsnakes | ||
apt-get update | ||
|
||
DEADSNAKES_PACKAGES=" | ||
python2.5 | ||
python2.5-dev | ||
python2.7 | ||
python2.7-dev | ||
python3.2 | ||
python3.2-dev | ||
" | ||
apt-get -y install $DEADSNAKES_PACKAGES | ||
|
||
|
||
PIP_PACKAGES=" | ||
virtualenv | ||
tox | ||
MySQL-python | ||
pycurl | ||
twisted | ||
" | ||
|
||
apt-get -y install $APT_PACKAGES | ||
pip install $PIP_PACKAGES | ||
|
||
/tornado/maint/vm/shared-setup.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,32 @@ | ||
[tox] | ||
envlist=py26-full, py26 | ||
envlist = py27-full, py25-full, py32, py25, py26, py26-full, py27 | ||
setupdir=/tornado | ||
toxworkdir=/home/vagrant/tox-tornado | ||
|
||
[testenv] | ||
commands = python -m tornado.test.runtests {posargs:} | ||
|
||
[testenv:py25] | ||
basepython = python2.5 | ||
deps = simplejson | ||
|
||
[testenv:py25-full] | ||
basepython = python2.5 | ||
deps = | ||
MySQL-python | ||
pycurl | ||
simplejson | ||
twisted==11.0.0 | ||
|
||
[testenv:py26-full] | ||
deps = | ||
MySQL-python | ||
pycurl | ||
twisted | ||
twisted==11.0.0 | ||
|
||
[testenv:py27-full] | ||
basepython = python2.7 | ||
deps = | ||
MySQL-python | ||
pycurl | ||
twisted==11.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters