From f5c5d3224f0bd6857d2461ebd6cdc3b727892e18 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Thu, 23 Nov 2017 14:40:57 +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: I492d11e6b7b83cbd8e78f965a86dbfa8624114d4
Related-Bug: #1718152
Depends-On: Ifc025d063d5fba5f2b8b20773b4a9543f883a0ea
---
 .stestr.conf | 3 +++
 .testr.conf  | 8 --------
 rebuild      | 1 +
 3 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 .stestr.conf
 delete mode 100644 .testr.conf
 create mode 100644 rebuild

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
new file mode 100644
index 0000000..f397350
--- /dev/null
+++ b/rebuild
@@ -0,0 +1 @@
+4be042c6-d05c-11e7-8df0-87433d3816c1