diff --git a/salt.changes b/salt.changes index 6fddb2e..6df6ef5 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 30 09:40:18 UTC 2024 - Pablo Suárez Hernández + +- Remove python-boto dependency for the python3-salt-testsuite package for Tumbleweed +- Rename salt-tests to python3-salt-testsuite + ------------------------------------------------------------------- Mon Jan 29 13:50:44 UTC 2024 - Pablo Suárez Hernández diff --git a/salt.spec b/salt.spec index 12d5242..4d352da 100644 --- a/salt.spec +++ b/salt.spec @@ -699,12 +699,30 @@ Requires(pre): %fillup_prereq Salt ssh is a master running without zmq. it enables the management of minions over a ssh connection. -%package tests +%package -n python3-salt-testsuite Summary: Unit and integration tests for Salt Requires: %{name} = %{version}-%{release} +Requires: python3-CherryPy +Requires: python3-Genshi +Requires: python3-Mako +%if !0%{?suse_version} > 1600 || 0%{?centos} +Requires: python3-boto +%endif +Requires: python3-boto3 +Requires: python3-docker +Requires: python3-mock +Requires: python3-pygit2 +Requires: python3-pytest >= 7.0.1 +Requires: python3-pytest-httpserver +Requires: python3-pytest-salt-factories >= 1.0.0~rc21 +Requires: python3-pytest-subtests +Requires: python3-testinfra +Requires: python3-yamllint -%description tests -Collections of unit and integration tests for Salt +Obsoletes: %{name}-tests + +%description -n python3-salt-testsuite +Collection of unit, functional, and integration tests for %{name}. %if %{with bash_completion} %package bash-completion @@ -852,10 +870,12 @@ install -Dd -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d/ install -Dpm 0644 salt/cli/support/profiles/* %{buildroot}%{python3_sitelib}/salt/cli/support/profiles # Install Salt tests -install -Dd -m 0750 %{buildroot}%{_datadir}/salt -install -Dd -m 0750 %{buildroot}%{_datadir}/salt/tests -cp -a tests/* %{buildroot}%{_datadir}/salt/tests/ -sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!/usr/bin/python3=' %{buildroot}%{_datadir}/salt/tests/runtests.py +install -Dd %{buildroot}%{python3_sitelib}/salt-testsuite +cp -a tests %{buildroot}%{python3_sitelib}/salt-testsuite/ +# Remove runtests.py which is not used as deprecated method of running the tests +rm %{buildroot}%{python3_sitelib}/salt-testsuite/tests/runtests.py +# Copy conf files to the testsuite as they are used by the tests +cp -a conf %{buildroot}%{python3_sitelib}/salt-testsuite/ ## Install Zypper plugins only on SUSE machines %if 0%{?suse_version} @@ -1432,7 +1452,10 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version %files -n python3-salt %defattr(-,root,root,-) -%{python3_sitelib}/* +%dir %{python3_sitelib}/salt +%dir %{python3_sitelib}/salt-*.egg-info +%{python3_sitelib}/salt/* +%{python3_sitelib}/salt-*.egg-info/* %exclude %{python3_sitelib}/salt/cloud/deploy/*.sh %if %{with docs} @@ -1441,10 +1464,8 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version %doc doc/_build/html %endif -%files tests -%dir %{_datadir}/salt/ -%dir %{_datadir}/salt/tests/ -%{_datadir}/salt/tests/* +%files -n python3-salt-testsuite +%{python3_sitelib}/salt-testsuite %if %{with bash_completion} %files bash-completion