Fix unittests

- Update horizon version
- Remove --upgrade option in venv installer and tox.ini
- Freeze oslo libs versions

Change-Id: I4b6697cba20699da59af8f9cc7440a669d9f0c6e
This commit is contained in:
Piotr Smialkowski 2015-07-24 14:09:08 +02:00
parent ef674d792c
commit 5cb8b8dad8
3 changed files with 12 additions and 7 deletions

View File

@ -1,6 +1,12 @@
# Hacking already pins down pep8, pyflakes and flake8
hacking>=0.9.2,<0.10
# Testing Requirements
# fix version problems
cffi==0.9.2
oslo.i18n==1.7.0
oslo.utils==1.9.0
oslo.serialization==1.7.0
coverage>=3.6
django-nose
mock>=1.0
@ -16,5 +22,4 @@ selenium
# Docs Requirements
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx
http://tarballs.openstack.org/horizon/horizon-2014.2.tar.gz#egg=horizon
http://tarballs.openstack.org/horizon/horizon-2015.1.0.tar.gz#egg=horizon

View File

@ -109,7 +109,7 @@ def create_virtualenv(venv=VENV):
def pip_install(*args):
args = [WITH_VENV, 'pip', 'install', '--upgrade'] + list(args)
args = [WITH_VENV, 'pip', 'install'] + list(args)
run_command(args, redirect_output=False)

View File

@ -5,10 +5,10 @@ skipsdist = True
[testenv]
usedevelop = True
install_command = pip install -U {opts} {packages}
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands = /bin/bash run_tests.sh -N {posargs}
[testenv:pep8]