From 2674bb7230903aa916ba97310b7b8282bd8c64c5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 28 Aug 2018 14:01:32 +0200
Subject: [PATCH] Switch to stestr and remove flake8 from the list of
 dependencies

Change-Id: I4db520e650f72407ebd8100f689af01fcf61cc5d
---
 .gitignore            | 2 +-
 .stestr.conf          | 3 +++
 .testr.conf           | 8 --------
 test-requirements.txt | 3 +--
 tox.ini               | 4 +++-
 5 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index 78581c6..19cfe02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ subunit.log
 .venv
 *,cover
 cover
-.testrepository
+.stestr
 *.pyc
 .idea
 *.sw?
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..3aeee01
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6e4d6d0..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 655bf69..5f40ff4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-flake8>=3.5.0 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
diff --git a/tox.ini b/tox.ini
index 398fd01..06c7676 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,10 +15,12 @@ setenv = VIRTUAL_ENV={envdir}
          CLIENT_NAME=pymod2pkg
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args='{posargs}'
+commands = stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3
+deps = {[testenv]deps}
+    flake8<2.7.0,>=2.6.0
 commands = flake8
 
 [testenv:venv]