From 7bc9e737845f2045f60988747e6eb3651cdbed33 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Wed, 13 Mar 2019 10:29:31 +0100
Subject: [PATCH] Update python-openstackclient to 3.18.0

Change-Id: Id871d6cb9c007b4fc083dc063e358ec224f006ec
---
 .../python-openstackclient/python-openstackclient.spec.j2 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/openstack/python-openstackclient/python-openstackclient.spec.j2 b/openstack/python-openstackclient/python-openstackclient.spec.j2
index 6b0479174..c2925a1e0 100644
--- a/openstack/python-openstackclient/python-openstackclient.spec.j2
+++ b/openstack/python-openstackclient/python-openstackclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-openstackclient' %}
-{% set upstream_version = upstream_version('3.16.0') %}
+{% set upstream_version = upstream_version('3.18.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -27,8 +27,8 @@ BuildRequires:  {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('osprofiler', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('requests', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }}
+BuildRequires:  {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('stevedore', py_versions=['py2', 'py3']) }}
-BuildRequires:  {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('testtools', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('wrapt', py_versions=['py2', 'py3']) }}
 Requires:       {{ py2pkg('Babel') }}
@@ -114,9 +114,7 @@ install -p -D -m 644 doc/build/man/openstack.1 %{buildroot}%{_mandir}/man1/opens
 
 
 %check
-%{python_expand rm -rf .testrepository
-$python setup.py testr
-}
+%python_exec -m stestr.cli run
 
 %files %{python_files}
 %doc README.rst