From 9fd34040363b2f0fb3de43310e4bf354c680f8c5 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Wed, 15 May 2019 15:10:04 +0900
Subject: [PATCH] Switch to stestr

This commit includes the following unrelated changes
to pass the gate.
----------------------------------------
Update sphinx requirements

After the recent change in the global requirements. [1]

[1] If558f184c959e4b63b56dec3ca1571d1034cfe5c

Closes-Bug: #1829138
Change-Id: Ic43783255091b77030983d5de0011b9bf4c3a486
----------------------------------------

Closes-Bug: #1829121
Change-Id: I06848d68f8e21880f05c003c2aa444f04dea2ef8
---
 .testr.conf           | 7 -------
 lower-constraints.txt | 3 +--
 test-requirements.txt | 5 +++--
 tox.ini               | 2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 .testr.conf

diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index d56c4781..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +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} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron_taas/tests/unit} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 7ced64db..835421e9 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -58,7 +58,6 @@ neutron==14.0.0.0b3
 openstacksdk==0.12.0
 os-client-config==1.29.0
 os-service-types==1.2.0
-os-testr==1.0.0
 os-xenapi==0.3.1
 osc-lib==1.10.0
 oslo.cache==1.29.0
@@ -129,7 +128,7 @@ sqlalchemy-migrate==0.11.0
 SQLAlchemy==1.2.5
 sqlparse==0.2.4
 statsd==3.2.2
-stestr==2.0.0
+stestr==1.0.0
 stevedore==1.28.0
 Tempita==0.5.2
 tenacity==4.9.0
diff --git a/test-requirements.txt b/test-requirements.txt
index a6820746..6cd77d56 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,13 +6,14 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 psycopg2>=2.7.5 # LGPL/ZPL
 PyMySQL>=0.7.6 # MIT License
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index bb173b72..c353ce2e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/re
 commands = find . -type f -name "*.py[c|o]" -delete
            find . -type l -name "*.py[c|o]" -delete
            find . -type d -name "__pycache__" -delete
-           ostestr --regex '{posargs}'
+           stestr run '{posargs}'
 whitelist_externals = find
 
 [tox:jenkins]