Accepting request 651221 from home:okurz:branches:Cloud:Tools

Add multibuild package self-test

OBS-URL: https://build.opensuse.org/request/show/651221
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli?expand=0&rev=13

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+    <package>test</package>
+</multibuild>

azure-cli.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 21 16:15:57 UTC 2018 - okurz@suse.com
+
+- Add multibuild package self-test
+
 -------------------------------------------------------------------
 Wed Nov 14 14:22:55 UTC 2018 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 

azure-cli.spec

@@ -12,11 +12,26 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
+# Define just "test" as a package in _multibuild file to distinguish test
+# instructions here
+%if "@BUILD_FLAVOR@" == ""
+%define _test 0
+%define name_ext %nil
+%else
+%define _test 1
+%define name_ext -test
+%endif
+
+%if !%{?_test}
 Name:           azure-cli
+%else
+Name:           azure-cli%{?name_ext}
+%endif
+%define         short_name azure-cli
 Version:        2.0.45
 Release:        0
 Summary:        Microsoft Azure CLI 2.0
@@ -26,6 +41,9 @@ Url:            https://github.com/Azure/azure-cli
 Source:         https://files.pythonhosted.org/packages/source/a/azure-cli/azure-cli-%{version}.tar.gz
 Source1:        LICENSE.txt
 Patch1:         ac_use-python3-by-default.patch
+%if 0%{?_test}
+BuildRequires:  %{short_name} = %{version}
+%else
 BuildRequires:  azure-cli-nspkg
 BuildRequires:  python3-azure-nspkg
 BuildRequires:  python3-devel
@@ -83,27 +101,44 @@ Requires:       python3-azure-nspkg
 Conflicts:      azure-cli < 2.0.0
 
 BuildArch:      noarch
+%endif
 
 %description
 Microsoft Azure CLI 2.0 Command Line Utilities
 
 %prep
+%if 0%{?_test}
+# workaround to prevent post/install failing assuming this file for whatever
+# reason
+touch %{_sourcedir}/%{short_name}
+%else
 %setup -q -n azure-cli-%{version}
 %patch1 -p1
+%endif
 
 %build
+%if 0%{?_test}
+az --help
+%else
 install -m 644 %{SOURCE1} %{_builddir}/azure-cli-%{version}
 python3 setup.py build
+%endif
 
 %install
+%if 0%{?_test}
+# disable debug packages in package test to prevent error about missing files
+%define debug_package %{nil}
+%else
 python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib}
 install -DTm644 %{buildroot}%{_bindir}/az.completion.sh %{buildroot}/etc/bash_completion.d/az.completion.sh
 rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.*
 rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__pycache__
 rm -rf %{buildroot}%{python3_sitelib}/azure/__init__.*
 rm -rf %{buildroot}%{python3_sitelib}/azure/__pycache__
+%endif
 
 %files
+%if !%{?_test}
 %defattr(-,root,root,-)
 %doc HISTORY.rst README.rst
 %license LICENSE.txt
@@ -113,5 +148,6 @@ rm -rf %{buildroot}%{python3_sitelib}/azure/__pycache__
 %exclude /usr/bin/az.completion.sh
 %{python3_sitelib}/azure/cli
 %{python3_sitelib}/azure_cli-*.egg-info
+%endif
 
 %changelog