Merge "Finish conversion to stestr"

test-requirements.txt

@@ -1,7 +1,5 @@
 mock
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage>=3.6 # Apache-2.0
-testrepository>=0.0.18
+stestr!=2.3.0  # Apache-2.0
 testtools>=1.4.0 # MIT
-os-testr>=0.4.1 # Apache-2.0
 ddt

tox.ini

@@ -2,20 +2,21 @@
 envlist = py35,py34,py27,pep8
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
-         LANGUAGE=en_US
          LC_ALL=en_US.UTF-8
          TESTS_DIR=./proliantutils/tests/
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
 deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
+    hacking!=0.13.0,<0.14,>=0.12.0
 commands =
     flake8 proliantutils