From 78f5fa40e27424e911d066a6eb7019a6e9170f67 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Thu, 23 Nov 2017 14:22:24 +0000
Subject: [PATCH] Rebuild + .testr.conf -> .stestr.conf due to Bug #1718152

The manila-plugin interface was the cause of bug #1718152.  This
is just to rebuild it and also migrate .testr.conf to .stestr.conf

Change-Id: Icd885409acdd788438857bcacdaac109b12cbad9
Related-Bug: #1718152
Depends-On: Ifc025d063d5fba5f2b8b20773b4a9543f883a0ea
---
 .gitignore   | 1 +
 .stestr.conf | 3 +++
 .testr.conf  | 8 --------
 rebuild      | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index a68c28d..98c9c5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ interfaces
 trusty
 .testrepository
 __pycache__
+.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5fcccac
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./unit_tests
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 801646b..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} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/rebuild b/rebuild
index 96698ec..39ca474 100644
--- a/rebuild
+++ b/rebuild
@@ -1 +1 @@
-0c101c14-8748-11e7-94e3-ab290b52a415
+8e836620-d058-11e7-a783-bfccc1ddeb2b