From 276f7570d7af4a7a62d0e1ffb4edf904cfbf0600 Mon Sep 17 00:00:00 2001
From: Victor Sergeyev <vsergeyev@mirantis.com>
Date: Fri, 18 Apr 2014 12:02:53 +0300
Subject: Make the tests passing

- add missed requirements
- add required modules from openstack.common
- added entry points to setup.cfg
- fixed tests location
- fixed incorrect common modules imports
---
 tox.ini | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 83f4dac..cde32ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8
+envlist = py26,py27,pep8
 # NOTE(dhellmann): We cannot set skipdist=True
 # for oslo libraries because of the namespace package.
 #skipsdist = True
@@ -12,6 +12,7 @@ envlist = py26,py27,py33,pypy,pep8
 install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
+   OSLO_LOCK_PATH=/tmp/
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
@@ -23,13 +24,13 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+commands = OSLO_LOCK_PATH=/tmp/ python setup.py testr --coverage --testr-args='{posargs}'
 
 [flake8]
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
 
 show-source = True
-ignore = E123,E125,H803
+ignore = E123,E125,H803,W292
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
\ No newline at end of file
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
-- 
cgit v1.2.1