Disable slow websocket performance tests by default.

Add pypy to the mix for when we do run the perf tests.  Depending on
the benchmark pypy is ~twice as fast as cpython 2.7
This commit is contained in:
Ben Darnell 2012-01-21 17:12:22 -08:00
parent bc28966ef5
commit 5a18d50f44
4 changed files with 10 additions and 6 deletions

View File

@ -11,7 +11,7 @@ define('servers', type=str, multiple=True,
define('cases', type=str, multiple=True,
default=["*"])
define('exclude', type=str, multiple=True,
default=[])
default=["9.*"])
if __name__ == '__main__':
parse_command_line()

View File

@ -4,8 +4,8 @@
# python2 and python3. Output goes in ./reports/servers/index.html.
#
# The --cases and --exclude arguments can be used to run only part of
# the suite. --exclude="9.*" is useful to skip the relatively slow
# performance tests.
# the suite. The default is --exclude="9.*" to skip the relatively slow
# performance tests; pass --exclude="" to override and include them.
set -e
@ -21,13 +21,17 @@ PY27_SERVER_PID=$!
.tox/py32/bin/python server.py --port=9003 &
PY32_SERVER_PID=$!
.tox/pypy/bin/python server.py --port=9004 &
PYPY_SERVER_PID=$!
sleep 1
.tox/py27/bin/python ./client.py --servers=Tornado/py25=ws://localhost:9001,Tornado/py27=ws://localhost:9002,Tornado/py32=ws://localhost:9003 "$@"
.tox/py27/bin/python ./client.py --servers=Tornado/py25=ws://localhost:9001,Tornado/py27=ws://localhost:9002,Tornado/py32=ws://localhost:9003,Tornado/pypy=ws://localhost:9004 "$@" || true
kill $PY25_SERVER_PID
kill $PY27_SERVER_PID
kill $PY32_SERVER_PID
kill $PYPY_SERVER_PID
wait
echo "Tests complete. Output is in ./reports/servers/index.html"

View File

@ -17,5 +17,5 @@ if __name__ == '__main__':
app = Application([
('/', EchoHandler),
])
app.listen(options.port, address='localhost')
app.listen(options.port, address='127.0.0.1')
IOLoop.instance().start()

View File

@ -2,7 +2,7 @@
# to install autobahn and deal with 2to3 for the python3 version.
# See run.sh for the real test runner.
[tox]
envlist = py27, py32, py25
envlist = py27, py32, py25, pypy
setupdir=../../..
[testenv]