From df6d73d59cb1c36dac5af6da89c9dd5808875dbb Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Mon, 10 Feb 2014 10:55:11 +0100
Subject: [PATCH] Added testr

---
 .testr.conf |  4 ++--
 tox.ini     | 48 +++++++++++++++++++-----------------------------
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/.testr.conf b/.testr.conf
index 42a77d38..d3026e87 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,8 +1,8 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t . ./tests $LISTOPT $IDOPTION
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
 
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tox.ini b/tox.ini
index bbf5f131..9f032352 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,49 +1,39 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8,lint2,lint3
+envlist = py26,py27,py33,pep8
 skipsdist = True
 
 [testenv]
-usedevelop = True
-# Customize pip command, add -U to force updates.
-install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-         GLANCE_STORE_TESTS_DIR={toxinidir}/tests
-         GLANCE_STORE_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
-
+usedevelop = True
+install_command = pip install --allow-all-external --allow-insecure netaddr -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-#commands = nosetests {posargs}
-commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}'
+commands = python setup.py test --slowest --testr-args='--concurrency 1 {posargs}'
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-commands = flake8
-
-[testenv:lint2]
-basepython = python2
-deps = pylint
-commands = pylint ./glance.store ./tests -E --ignore ./openstack
-
-[testenv:lint3]
-basepython = python3
-deps = pylint
-commands = pylint ./glance.store ./tests -E --ignore ./openstack
+commands =
+  flake8 {posargs}
 
 [testenv:cover]
-setenv = NOSE_WITH_COVERAGE=1
-commands =
-  python setup.py testr --coverage \
-    --testr-args='^(?!.*test.*coverage).*$'
+setenv = VIRTUAL_ENV={envdir}
+commands = python setup.py testr --coverage --testr-args='^(?!.*test.*coverage).*$'
 
 [testenv:venv]
 commands = {posargs}
 
 [flake8]
-exclude = .venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv
-
-[hacking]
-import_exceptions = glance.store.openstack.common.gettextutils._
-
+# TODO(dmllr): Analyze or fix the warnings blacklisted below
+# E711  comparison to None should be 'if cond is not None:'
+# E712  comparison to True should be 'if cond is True:' or 'if cond:'
+# F821  undefined name 'name'
+# F841  local variable 'name' assigned but never used
+# H301  one import per line
+# H402  one line docstring needs punctuation.
+# H404  multi line docstring should start with a summary
+ignore = E711,E712,F821,F841,H301,H402,H404
+builtins = _
+exclude = .venv,.git,.tox,dist,doc,etc,*glance/store/locale*,*openstack/common*,*lib/python*,*egg,build