Merge pull request #186 from TimSimpsonR/local_runner

Removing the "fake-mode" tox env in favor of specifically using 2.6.
This commit is contained in:
Tim Simpson 2012-09-04 18:58:48 -07:00
commit b5af546ced
2 changed files with 8 additions and 12 deletions

View File

@ -3,7 +3,7 @@
tox -e fake-mode
function run() {
.tox/fake-mode/bin/python $@
.tox/py26/bin/python $@
}
run bin/reddwarf-manage \
--config-file=etc/reddwarf/reddwarf.conf.test db_wipe \

18
tox.ini
View File

@ -1,19 +1,14 @@
# If you get compilation errors with one or more deps in Linux, try this:
# $ sudo apt-get install python2.6-dev
# To run a specific environment in tox, use the "-e" cmd line flag.
# For example, to run pep8, use:
# tox -e pep8
[tox]
envlist = py26, py27
envlist = py26
[testenv:pep8]
# Tests pep8 compliance.
deps = pep8==1.1
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
[testenv:fake-mode]
# Fakes Nova, the guest, and other external dependencies to stand up a
# otherwise valid service api that can be used to test most code paths.
[testenv:py26]
deps =
eventlet
factory_boy
@ -25,6 +20,7 @@ deps =
netaddr
paste
PasteDeploy
pep8==1.3.3
python-novaclient
routes
sphinx
@ -33,4 +29,4 @@ deps =
WebOb
webtest
commands =
pep8 {toxinidir}
#{envbindir}/pep8 {toxinidir}/reddwarf --exclude=.tox,.venv