diff options
| author | Gabriel Hurley <gabriel@strikeawe.com> | 2012-04-11 14:04:08 -0700 |
|---|---|---|
| committer | Gabriel Hurley <gabriel@strikeawe.com> | 2012-04-23 22:24:21 -0700 |
| commit | a2e7b109182f179ebe651876958e73c4a0d8affa (patch) | |
| tree | b23b6a5b88dd87835b099632d60237134e325674 /tools | |
| parent | 13a356e0eddf8a2e386a88a1a1c4cf7d0ac67d72 (diff) | |
| download | horizon-a2e7b109182f179ebe651876958e73c4a0d8affa.tar.gz | |
Revamp of testing machinery.
* Uses Django 1.4 as minimum version for Folsom.
* Switches to using Django 1.4's LiveServerTestCase instead of
django-nose-selenium and cherrypy.
* Moves django-nose to be a test dependency only. Fixes bug 801362.
Change-Id: I5c8a145aba868acf355fe215307d7ce8835913f6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pip-requires | 16 | ||||
| -rw-r--r-- | tools/test-requires | 4 |
2 files changed, 3 insertions, 17 deletions
diff --git a/tools/pip-requires b/tools/pip-requires index 498cc1b08..db2d82376 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,21 +1,7 @@ # Horizon Core Requirements -Django>=1.3 +Django>=1.4 python-cloudfiles python-dateutil -django-nose - -# Glance Requirements -PasteDeploy -eventlet -kombu -paste -pycrypto==2.3 -routes -sqlalchemy -sqlalchemy-migrate -webob==1.0.8 -xattr -iso8601 # Horizon Non-pip Requirements -e git+https://github.com/openstack/python-novaclient.git#egg=python-novaclient diff --git a/tools/test-requires b/tools/test-requires index c8fa4b422..da054d5ea 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -1,12 +1,12 @@ # Testing Requirements -CherryPy coverage -django-nose-selenium +django-nose mox nose pep8 pylint distribute>=0.6.24 +selenium # Docs Requirements sphinx |