From 9fd0156bbb96c29d863bafb5834b8616b27918d9 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 14 May 2019 11:55:29 +0200
Subject: [PATCH] Finish conversion to stestr

In I565cd2593982a1b5c8c43cf394301c56e24b9b29 a half conversion
was performed to switch to stestr, but the dependency information
was not actually updated. Since ostestr is just a wrapper around
stestr, we don't need testrepository anymore. Also since we're
now calling stestr directly we can stop depending on the ostestr
wrapper. Also move hacking dependency into the pep8 tox environment
as it isn't needed for tests

Change-Id: Ia60c018b8691fd175468bdad81e604cbbc0e1b74
---
 test-requirements.txt | 4 +---
 tox.ini               | 9 +++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 7c748fe6..e9681017 100644
--- a/test-requirements.txt
+++ b/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
diff --git a/tox.ini b/tox.ini
index ae8d0c16..e5fde6a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,21 +2,22 @@
 envlist = py35,py34,py27,pep8
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {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]
 basepython = python2.7
 deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
+    hacking!=0.13.0,<0.14,>=0.12.0
 commands =
     flake8 proliantutils