From 2cf4285bfc2b0bb2bd103426a5c701b492f24763 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 7 Oct 2019 10:46:36 +0200
Subject: [PATCH] monasca-api: Fix fdupes call and cleanup %check

- We switched to python3, so use the correct path for fdupes
- Simplify the stestr call. No need for an %if there

Change-Id: Ifdb3405bd2e385c814c62318636ff8e965aaf266
---
 openstack/monasca-api/monasca-api.spec.j2 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/openstack/monasca-api/monasca-api.spec.j2 b/openstack/monasca-api/monasca-api.spec.j2
index 881e6ab71..abfe27a35 100644
--- a/openstack/monasca-api/monasca-api.spec.j2
+++ b/openstack/monasca-api/monasca-api.spec.j2
@@ -135,15 +135,11 @@ install -p -D -m 640 %{SOURCE4} %{buildroot}%{apache_site_dir}/{{ pypi_name }}.c
 install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/monasca-api-wsgi.py
 
 # remove duplicates
-%fdupes %{buildroot}%{python2_sitelib}/monasca_api
+%fdupes %{buildroot}%{python3_sitelib}/monasca_api
 
 %check
 find . -type f -name *.pyc -delete
-%if 0%{?suse_version}
-OS_TEST_PATH=./monasca_api/tests PYTHONPATH=. PYTHON=python3 stestr run
-%else
-OS_TEST_PATH=./monasca_api/tests PYTHONPATH=. stestr-3 run
-%endif
+%{__python3} -m stestr.cli --test-path=./monasca_api/tests run
 
 %pre
 %openstack_pre_user_group_create monasca-api monasca /sbin/nologin