openstack/rpm-packaging
Code Issues Proposed changes

monasca-api: Fix fdupes call and cleanup %check

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

Change-Id: Ifdb3405bd2e385c814c62318636ff8e965aaf266
This commit is contained in:
Thomas Bechtold 2019-10-07 10:46:36 +02:00
parent 30843b9008
commit 2cf4285bfc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack/monasca-api/monasca-api.spec.j2
View File

@ -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 install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/monasca-api-wsgi.py
# remove duplicates # remove duplicates
%fdupes %{buildroot}%{python2_sitelib}/monasca_api %fdupes %{buildroot}%{python3_sitelib}/monasca_api
%check %check
find . -type f -name *.pyc -delete find . -type f -name *.pyc -delete
%if 0%{?suse_version} %{__python3} -m stestr.cli --test-path=./monasca_api/tests run
OS_TEST_PATH=./monasca_api/tests PYTHONPATH=. PYTHON=python3 stestr run
%else
OS_TEST_PATH=./monasca_api/tests PYTHONPATH=. stestr-3 run
%endif
%pre %pre
%openstack_pre_user_group_create monasca-api monasca /sbin/nologin %openstack_pre_user_group_create monasca-api monasca /sbin/nologin