summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@dreamhost.com>2013-07-21 15:35:53 -0400
committerDoug Hellmann <doug.hellmann@dreamhost.com>2013-07-21 15:51:14 -0400
commit6aeee95e2acf703a6e41b7172f2333e899038332 (patch)
tree06f217d5c25b3d298f33f822ba1bcff4eff7f9b1
parentaa7a6fd3270710e533f84e04c84a94d46fa15266 (diff)
downloadpbr-6aeee95e2acf703a6e41b7172f2333e899038332.tar.gz
Fix python 3.3 tests
We can go back to using the official release of testrepository for testing under python 3, so do. Make python 3.3 part of the default environment set for anyone running all of the tests. Change-Id: I0c56f9cde643ef8580ab305080bc62b87809bf7e
-rw-r--r--test-requirements-py3.txt10
-rw-r--r--tox.ini6
2 files changed, 1 insertions, 15 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
deleted file mode 100644
index eba16b8..0000000
--- a/test-requirements-py3.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-coverage>=3.6
-discover
-fixtures>=0.3.12
-flake8
-python-subunit
-sphinx>=1.1.2
--e bzr+lp:testrepository#egg=testrepository
-testresources
-testscenarios
-testtools>=0.9.27
diff --git a/tox.ini b/tox.ini
index 0c9be27..1cf797c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pep8
+envlist = py26,py27,py33,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
@@ -11,10 +11,6 @@ deps = -r{toxinidir}/requirements.txt
commands =
python setup.py testr --testr-args='{posargs}'
-[testenv:py33]
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements-py3.txt
-
[tox:jenkins]
sitepackages = True
downloadcache = ~/cache/pip