From ddccac8dc3ac30219f6d77e8d207e070065d621c Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Wed, 13 Sep 2017 05:51:28 -0400
Subject: [PATCH] tests: replace .testr.conf with .stestr.conf

In this change [1] os_testr changed under the covers from using
testr to stestr, so that we now get the following warning:

 ostestr.py:120:
 UserWarning: No .stestr.conf file found in the CWD.
 Please create one to to replace the .testr.conf. You can find a
 script to do this in the stestr git repository.

So remove the .testr.conf and add .stestr.conf which was
generated using a utility script as documented here [2].

[1] Id7cb2a39a8308f1413608dcf19273a1d7f33592e
[2] https://media.readthedocs.org/pdf/stestr/stable/stestr.pdf

TrivialFix

Change-Id: I6bb369624c4a790242022e203e771a77ffe06cf5
---
 .gitignore   | 1 +
 .stestr.conf | 3 +++
 .testr.conf  | 8 --------
 3 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index b3743b9fdc..009a831c47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.swp
 .manila-venv
 .coverage
+.stestr/*
 .testrepository
 .tox
 .venv
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000000..dffacbd97f
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./manila/tests
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 78b3824909..0000000000
--- 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 ./ ./manila/tests $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list