From dd1a190a670bd71c4a219e546df6c6de14254c10 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 17 Nov 2020 13:42:13 -0500 Subject: [PATCH 01/17] Sync with upstream release 83.0. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 62 ++++++++------------------------------------- sources | 2 +- 3 files changed, 12 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index bf17c05..9911759 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /avocado-79.0.tar.gz /avocado-80.0.tar.gz /avocado-82.0.tar.gz +/avocado-83.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index d8ed3a8..a128bbc 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit e97540793998c4f24a16000465dd7fdd213bf2b9 + %global commit 4e0580a36a6c4089c96c9928905c1d9ae5e4f3be %endif %if ! 0%{?commit_date:1} - %global commit_date 20200911 + %global commit_date 20201116 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 82.0 +Version: 83.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -107,9 +107,6 @@ popd pushd optional_plugins/varianter_yaml_to_mux %py3_build popd -pushd optional_plugins/loader_yaml - %py3_build -popd pushd optional_plugins/golang %py3_build popd @@ -122,9 +119,6 @@ popd pushd optional_plugins/result_upload %py3_build popd -pushd optional_plugins/glib - %py3_build -popd %{__make} man %install @@ -160,9 +154,6 @@ popd pushd optional_plugins/varianter_yaml_to_mux %py3_install popd -pushd optional_plugins/loader_yaml - %py3_install -popd pushd optional_plugins/golang %py3_install popd @@ -175,9 +166,6 @@ popd pushd optional_plugins/result_upload %py3_install popd -pushd optional_plugins/glib - %py3_install -popd # cleanup plugin test cruft %{__rm} -rf %{buildroot}%{python3_sitelib}/tests %{__mkdir} -p %{buildroot}%{_sysconfdir}/avocado @@ -201,7 +189,6 @@ popd %{__cp} -r examples/varianter_pict %{buildroot}%{_docdir}/avocado/varianter_pict %{__cp} -r examples/wrappers %{buildroot}%{_docdir}/avocado/wrappers %{__cp} -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux -%{__cp} -r examples/yaml_to_mux_loader %{buildroot}%{_docdir}/avocado/yaml_to_mux_loader find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x {} ';' @@ -220,9 +207,6 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x pushd optional_plugins/varianter_yaml_to_mux %{__python3} setup.py develop --user popd - pushd optional_plugins/loader_yaml - %{__python3} setup.py develop --user - popd pushd optional_plugins/golang %{__python3} setup.py develop --user popd @@ -235,9 +219,6 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x pushd optional_plugins/result_upload %{__python3} setup.py develop --user popd - pushd optional_plugins/glib - %{__python3} setup.py develop --user - popd # LANG: to make the results predictable, we pin the language # that is used during test execution. # AVOCADO_CHECK_LEVEL: package build environments have the least @@ -373,20 +354,6 @@ defined in a yaml file(s). %{python3_sitelib}/avocado_framework_plugin_varianter_yaml_to_mux-%{version}-py%{python3_version}.egg-info -%package -n python3-%{pkgname}-plugins-loader-yaml -Summary: Avocado plugin that loads tests from YAML files -%{?python_provide:%python_provide python3-%{pkgname}-plugins-loader-yaml} -Requires: python3-%{pkgname}-plugins-varianter-yaml-to-mux == %{version}-%{release} - -%description -n python3-%{pkgname}-plugins-loader-yaml -Can be used to produce a test suite from definitions in a YAML file, -similar to the one used in the yaml_to_mux varianter plugin. - -%files -n python3-%{pkgname}-plugins-loader-yaml -%{python3_sitelib}/avocado_loader_yaml/ -%{python3_sitelib}/avocado_framework_plugin_loader_yaml-%{version}-py%{python3_version}.egg-info - - %package -n python3-%{pkgname}-plugins-golang Summary: Avocado plugin for execution of golang tests %{?python_provide:%python_provide python3-%{pkgname}-plugins-golang} @@ -400,7 +367,7 @@ also run them. %files -n python3-%{pkgname}-plugins-golang %{python3_sitelib}/avocado_golang/ %{python3_sitelib}/avocado_framework_plugin_golang-%{version}-py%{python3_version}.egg-info - +%{_bindir}/avocado-runner-golang %package -n python3-%{pkgname}-plugins-varianter-pict Summary: Varianter with combinatorial capabilities by PICT @@ -445,20 +412,6 @@ a dedicated sever. %{python3_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python3_version}.egg-info -%package -n python3-%{pkgname}-plugins-glib -Summary: Avocado plugin for execution of GLib Test Framework tests -%{?python_provide:%python_provide python3-%{pkgname}-plugins-glib} -Requires: python3-%{pkgname} == %{version}-%{release} - -%description -n python3-%{pkgname}-plugins-glib -This optional plugin is intended to list and run tests written in the -GLib Test Framework. - -%files -n python3-%{pkgname}-plugins-glib -%{python3_sitelib}/avocado_glib/ -%{python3_sitelib}/avocado_framework_plugin_glib-%{version}-py%{python3_version}.egg-info - - %package -n python-%{pkgname}-examples Summary: Avocado Test Framework Example Tests License: GPLv2 @@ -479,7 +432,6 @@ examples of how to write tests on your own. %{_docdir}/avocado/varianter_pict %{_docdir}/avocado/wrappers %{_docdir}/avocado/yaml_to_mux -%{_docdir}/avocado/yaml_to_mux_loader %package -n python-%{pkgname}-bash @@ -500,6 +452,12 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Nov 17 2020 Cleber Rosa - 83.0-1 +- Sync with upstream release 83.0. +- Added avocado-runner-golang script to golang package +- Removed glib plugin +- Removed yaml to mux loader plugin + * Mon Sep 14 2020 Cleber Rosa - 82.0-1 - Sync with upstream release 82.0. - Removed python libvirt depedency as the vm runner has been removed diff --git a/sources b/sources index 4721c3f..1b40424 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-82.0.tar.gz) = 099ab131b2b941602550e71507e4ca517d5d2cd5152b255edace0473c9de93aac8163a61689414b5b58f9211f58981c3c30c1c3ca8a191283f609722ce07f173 +SHA512 (avocado-83.0.tar.gz) = 9b43508ecf37b1db7b6b97080317f7849c2658638b13f1f3554f7a57c550c03295a0b818167daa78e7730beec585a39cef09a21361f21ed42c059d4ef7d1913a From 34b61b19ca77945bce7e3623c145d112ab9ec881 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 9 Feb 2021 19:45:50 -0500 Subject: [PATCH 02/17] Sync with upstream release 84.0. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9911759..6827791 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /avocado-80.0.tar.gz /avocado-82.0.tar.gz /avocado-83.0.tar.gz +/avocado-84.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index a128bbc..fc223c9 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 4e0580a36a6c4089c96c9928905c1d9ae5e4f3be + %global commit c01f71fcc05826a08ea1b28b47930722b3363df4 %endif %if ! 0%{?commit_date:1} - %global commit_date 20201116 + %global commit_date 20201221 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 83.0 +Version: 84.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -90,7 +90,7 @@ these days a framework) to perform automated testing. %prep %setup -q -n %{srcname}-%{gitref} -%if (0%{?fedora} && 0%{?fedora} < 29) || 0%{?rhel} +%if 0%{?rhel} sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py %endif @@ -225,7 +225,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x # amount of resources we have observed so far. Let's avoid tests that # require too much resources or are time sensitive USER_BASE=`%{__python3} -m site --user-base` - PATH=$USER_BASE/bin:$PATH LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 %{__python3} selftests/run + PATH=$USER_BASE/bin:$PATH LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 %{__python3} selftests/check.py --disable-static-checks --disable-plugin-checks=robot %endif @@ -452,6 +452,11 @@ Again Shell code (and possibly other similar shells). %changelog +* Wed Feb 10 2021 Cleber Rosa - 84.0-1 +- Sync with upstream release 84.0. +- Drop old Fedora conditionals +- Use selftests/check.py job instead of more limited selftests/run + * Tue Nov 17 2020 Cleber Rosa - 83.0-1 - Sync with upstream release 83.0. - Added avocado-runner-golang script to golang package diff --git a/sources b/sources index 1b40424..b0380d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-83.0.tar.gz) = 9b43508ecf37b1db7b6b97080317f7849c2658638b13f1f3554f7a57c550c03295a0b818167daa78e7730beec585a39cef09a21361f21ed42c059d4ef7d1913a +SHA512 (avocado-84.0.tar.gz) = 8ff8d5f976c2f3f48c70acb5d157b3a4ed27c56e99e9689213ae54d64fb2e37083ee156b3d55cd75b4766a0c75c27541770550860a25893223749ef8b340cdd1 From bf1deffff491f830a61f922277a655d646a6b0cb Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 9 Feb 2021 20:28:44 -0500 Subject: [PATCH 03/17] Sync with upstream release 85.0. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6827791..9508ef3 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /avocado-82.0.tar.gz /avocado-83.0.tar.gz /avocado-84.0.tar.gz +/avocado-85.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index fc223c9..09f976e 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit c01f71fcc05826a08ea1b28b47930722b3363df4 + %global commit 954ff938991894a73171463d329b6bfa748c6652 %endif %if ! 0%{?commit_date:1} - %global commit_date 20201221 + %global commit_date 20210209 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 84.0 +Version: 85.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -452,6 +452,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Wed Feb 10 2021 Cleber Rosa - 85.0-1 +- Sync with upstream release 85.0. + * Wed Feb 10 2021 Cleber Rosa - 84.0-1 - Sync with upstream release 84.0. - Drop old Fedora conditionals diff --git a/sources b/sources index b0380d8..e464bb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-84.0.tar.gz) = 8ff8d5f976c2f3f48c70acb5d157b3a4ed27c56e99e9689213ae54d64fb2e37083ee156b3d55cd75b4766a0c75c27541770550860a25893223749ef8b340cdd1 +SHA512 (avocado-85.0.tar.gz) = 16134248fa5300cc861419f1c371cd7e2c00c25b6275c288185d04e4290bde44b6d687d05ca4e224cb910e48de1fb39195e9f2e3a08900d5f33d5cd227ed6f1f From ad5c2de8e61892772f22b809ad9a67f4f7982344 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Mon, 15 Mar 2021 21:48:00 -0400 Subject: [PATCH 04/17] Sync with upstream release 86.0. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9508ef3..24f2a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /avocado-83.0.tar.gz /avocado-84.0.tar.gz /avocado-85.0.tar.gz +/avocado-86.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 09f976e..81325a0 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 954ff938991894a73171463d329b6bfa748c6652 + %global commit 84ee92d6638ad947722c9130eae0102b3677426d %endif %if ! 0%{?commit_date:1} - %global commit_date 20210209 + %global commit_date 20210315 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 85.0 +Version: 86.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -119,7 +119,7 @@ popd pushd optional_plugins/result_upload %py3_build popd -%{__make} man +rst2man man/avocado.rst man/avocado.1 %install %py3_install @@ -452,6 +452,10 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Mar 16 2021 Cleber Rosa - 86.0-1 +- Sync with upstream release 86.0. +- Do not depend on make to build man page + * Wed Feb 10 2021 Cleber Rosa - 85.0-1 - Sync with upstream release 85.0. diff --git a/sources b/sources index e464bb2..878334d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-85.0.tar.gz) = 16134248fa5300cc861419f1c371cd7e2c00c25b6275c288185d04e4290bde44b6d687d05ca4e224cb910e48de1fb39195e9f2e3a08900d5f33d5cd227ed6f1f +SHA512 (avocado-86.0.tar.gz) = 85c2a6987de3658bfff9a46ce1d7214e1ac2c6017f6cfe9b1bb6dc36161efd08836f336f6df4a3baa89d73394aa2cc3fa3af2814b5156b3e2d6635b1c73ef40a From 471c4169f044962e3adff0a31818d7169311f847 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 13 Apr 2021 23:56:22 -0400 Subject: [PATCH 05/17] Sync with upstream release 87.0. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24f2a1a..4070858 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /avocado-84.0.tar.gz /avocado-85.0.tar.gz /avocado-86.0.tar.gz +/avocado-87.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 81325a0..b2114fd 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 84ee92d6638ad947722c9130eae0102b3677426d + %global commit 56d1df84fe9a88978c5b7fe538539887d81bf137 %endif %if ! 0%{?commit_date:1} - %global commit_date 20210315 + %global commit_date 20210413 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 86.0 +Version: 87.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -452,6 +452,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Wed Apr 14 2021 Cleber Rosa - 87.0-1 +- Sync with upstream release 87.0. + * Tue Mar 16 2021 Cleber Rosa - 86.0-1 - Sync with upstream release 86.0. - Do not depend on make to build man page diff --git a/sources b/sources index 878334d..d05de58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-86.0.tar.gz) = 85c2a6987de3658bfff9a46ce1d7214e1ac2c6017f6cfe9b1bb6dc36161efd08836f336f6df4a3baa89d73394aa2cc3fa3af2814b5156b3e2d6635b1c73ef40a +SHA512 (avocado-87.0.tar.gz) = ac1db5a242e4128cf8f10c1998ed21b6f274c4ec8131f8028ca51db64278774eb5a24c02b0bb4d2325196d3378d3f752aad8b2877ab75f29c4ad1ec89c14ef0a From d8dea0a273ea3e565e34fc16d79f44736efcd9f4 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 18 May 2021 00:17:54 -0400 Subject: [PATCH 06/17] Sync with upstream release 88.1. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4070858..e7329a0 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /avocado-85.0.tar.gz /avocado-86.0.tar.gz /avocado-87.0.tar.gz +/avocado-88.1.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index b2114fd..7eeb7c6 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 56d1df84fe9a88978c5b7fe538539887d81bf137 + %global commit 1fba8042a8a4a83f5342138786240f676e58074d %endif %if ! 0%{?commit_date:1} - %global commit_date 20210413 + %global commit_date 20210517 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 87.0 +Version: 88.1 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -132,6 +132,7 @@ for exe in \ avocado-runner-python-unittest \ avocado-runner-avocado-instrumented \ avocado-runner-tap \ + avocado-runner-requirement-package \ avocado-software-manager do %{__mv} %{buildroot}%{_bindir}/$exe %{buildroot}%{_bindir}/$exe-%{python3_version} @@ -277,6 +278,9 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-tap-%{python3_version} %{_bindir}/avocado-runner-tap-3 %{_bindir}/avocado-runner-tap +%{_bindir}/avocado-runner-requirement-package-%{python3_version} +%{_bindir}/avocado-runner-requirement-package-3 +%{_bindir}/avocado-runner-requirement-package %{_bindir}/avocado-software-manager-%{python3_version} %{_bindir}/avocado-software-manager-3 %{_bindir}/avocado-software-manager @@ -452,6 +456,10 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue May 18 2021 Cleber Rosa - 88.1-1 +- Sync with upstream release 88.1. +- Included avocado-runner-requirement-package executables + * Wed Apr 14 2021 Cleber Rosa - 87.0-1 - Sync with upstream release 87.0. diff --git a/sources b/sources index d05de58..909fb7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-87.0.tar.gz) = ac1db5a242e4128cf8f10c1998ed21b6f274c4ec8131f8028ca51db64278774eb5a24c02b0bb4d2325196d3378d3f752aad8b2877ab75f29c4ad1ec89c14ef0a +SHA512 (avocado-88.1.tar.gz) = 657151d1fd87e1b64ed8cde0c4f991cd4932a200611856e822f9ebc3ab89103de87bc301afc29c7441490b9da0e201711c92f4a3b0787eea46c5f6b51a81c074 From 6a0c9445924c9115fcbf44dc09f710e021b56cea Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 22 Jun 2021 13:54:45 -0400 Subject: [PATCH 07/17] Sync with upstream release 89.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 18 +++++++++++++++--- sources | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e7329a0..68e83ee 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /avocado-86.0.tar.gz /avocado-87.0.tar.gz /avocado-88.1.tar.gz +/avocado-89.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 7eeb7c6..7f22ac8 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 1fba8042a8a4a83f5342138786240f676e58074d + %global commit 5c5e83340a6041cf470186c48be9d50cb07f9486 %endif %if ! 0%{?commit_date:1} - %global commit_date 20210517 + %global commit_date 20210621 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 88.1 +Version: 89.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -127,11 +127,13 @@ for exe in \ avocado \ avocado-runner \ avocado-runner-noop \ + avocado-runner-dry-run \ avocado-runner-exec \ avocado-runner-exec-test \ avocado-runner-python-unittest \ avocado-runner-avocado-instrumented \ avocado-runner-tap \ + avocado-runner-requirement-asset \ avocado-runner-requirement-package \ avocado-software-manager do @@ -263,6 +265,9 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-noop-%{python3_version} %{_bindir}/avocado-runner-noop-3 %{_bindir}/avocado-runner-noop +%{_bindir}/avocado-runner-dry-run-%{python3_version} +%{_bindir}/avocado-runner-dry-run-3 +%{_bindir}/avocado-runner-dry-run %{_bindir}/avocado-runner-exec-%{python3_version} %{_bindir}/avocado-runner-exec-3 %{_bindir}/avocado-runner-exec @@ -278,6 +283,9 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-tap-%{python3_version} %{_bindir}/avocado-runner-tap-3 %{_bindir}/avocado-runner-tap +%{_bindir}/avocado-runner-requirement-asset-%{python3_version} +%{_bindir}/avocado-runner-requirement-asset-3 +%{_bindir}/avocado-runner-requirement-asset %{_bindir}/avocado-runner-requirement-package-%{python3_version} %{_bindir}/avocado-runner-requirement-package-3 %{_bindir}/avocado-runner-requirement-package @@ -456,6 +464,10 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Jun 22 2021 Cleber Rosa - 89.0-1 +- Sync with upstream release 89.0. +- Packaged avocado-runner-dry-run and avocado-runner-requirement-asset + * Tue May 18 2021 Cleber Rosa - 88.1-1 - Sync with upstream release 88.1. - Included avocado-runner-requirement-package executables diff --git a/sources b/sources index 909fb7d..8a82bb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-88.1.tar.gz) = 657151d1fd87e1b64ed8cde0c4f991cd4932a200611856e822f9ebc3ab89103de87bc301afc29c7441490b9da0e201711c92f4a3b0787eea46c5f6b51a81c074 +SHA512 (avocado-89.0.tar.gz) = 37b7545da4c7b2a5fd073de0212bce66ea2a93e45e513f10769b2ee305071e9c5cd8fa54cfd81209d1c62a9c0a9da069890808a701344ecd06515622b87baec3 From 21ebe30b86182bb0aca016aea2c8b0e2605ac063 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 1 Jul 2021 15:45:39 -0500 Subject: [PATCH 08/17] Spec file cleanup identified during package review to bring back non-modular version of package. Signed-off-by: Merlin Mathesius --- avocado-89.0-passtest-path-fix.patch | 24 +++ python-avocado.spec | 269 +++++++++++++-------------- 2 files changed, 149 insertions(+), 144 deletions(-) create mode 100644 avocado-89.0-passtest-path-fix.patch diff --git a/avocado-89.0-passtest-path-fix.patch b/avocado-89.0-passtest-path-fix.patch new file mode 100644 index 0000000..7af4756 --- /dev/null +++ b/avocado-89.0-passtest-path-fix.patch @@ -0,0 +1,24 @@ +From 8e2d7da5868ca2ae1c66c24a3e5c2957daffc7d7 Mon Sep 17 00:00:00 2001 +From: Merlin Mathesius +Date: Thu, 1 Jul 2021 15:04:14 -0500 +Subject: [PATCH] Specify the complete relative path to passtest.py in + HtmlResultTest.test_output_compatible_setup_2 so it finds the script to run. + +Signed-off-by: Merlin Mathesius +--- + optional_plugins/html/tests/test_html_result.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/optional_plugins/html/tests/test_html_result.py b/optional_plugins/html/tests/test_html_result.py +index b123a669aa..e074d3bc3a 100644 +--- a/optional_plugins/html/tests/test_html_result.py ++++ b/optional_plugins/html/tests/test_html_result.py +@@ -53,7 +53,7 @@ def test_output_compatible_setup_2(self): + tmpfile3 = os.path.join(tmpdir, "result.html") + cmd_line = ('avocado run --job-results-dir %s --disable-sysinfo ' + '--xunit %s --json %s --html %s --tap-include-logs ' +- 'passtest.py' % (self.tmpdir.name, tmpfile, tmpfile2, tmpfile3)) ++ 'examples/tests/passtest.py' % (self.tmpdir.name, tmpfile, tmpfile2, tmpfile3)) + result = process.run(cmd_line, ignore_status=True) + output = result.stdout + result.stderr + expected_rc = exit_codes.AVOCADO_ALL_OK diff --git a/python-avocado.spec b/python-avocado.spec index 7f22ac8..86ea66d 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -1,6 +1,3 @@ -%global srcname avocado -%global pkgname avocado - # Conditional for release vs. snapshot builds. Set to 1 for release build. %if ! 0%{?rel_build:1} %global rel_build 1 @@ -9,7 +6,7 @@ # Settings used for build from snapshots. %if 0%{?rel_build} %global gitref %{version} - %global gittar %{srcname}-%{version}.tar.gz + %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} %global commit 5c5e83340a6041cf470186c48be9d50cb07f9486 @@ -20,7 +17,7 @@ %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} %global gitref %{commit} - %global gittar %{srcname}-%{shortcommit}.tar.gz + %global gittar avocado-%{shortcommit}.tar.gz %endif # Selftests are provided but may need to be skipped because many of @@ -29,25 +26,30 @@ # enabled by default. %global with_tests 1 -# resultsdb is only available for Fedora -%if 0%{?fedora} +# resultsdb is not available for RHEL +%if ! 0%{?rhel} %global with_resultsdb 1 %else %global with_resultsdb 0 %endif -Name: python-%{pkgname} +Name: python-avocado Version: 89.0 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing -Group: Development/Tools # Found licenses: +# avocado/core/tapparser.py: MIT # avocado/utils/external/gdbmi_parser.py: MIT # avocado/utils/external/spark.py: MIT +# optional_plugins/html/avocado_result_html/templates/bootstrap.min.css: MIT +# optional_plugins/html/avocado_result_html/templates/bootstrap.min.js: MIT +# selftests/.data/jenkins-junit.xsd: MIT # Other files: GPLv2 and GPLv2+ -License: GPLv2 and MIT -URL: http://avocado-framework.github.io/ -Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar} +License: GPLv2+ and GPLv2 and MIT +URL: https://avocado-framework.github.io/ +Source0: https://github.com/avocado-framework/avocado/archive/%{gitref}/%{gittar} +# Patch from https://github.com/avocado-framework/avocado/pull/4759 +Patch0: avocado-89.0-passtest-path-fix.patch BuildArch: noarch BuildRequires: kmod @@ -56,28 +58,21 @@ BuildRequires: python3-devel BuildRequires: python3-docutils BuildRequires: python3-jinja2 BuildRequires: python3-lxml -BuildRequires: python3-mock BuildRequires: python3-psutil BuildRequires: python3-setuptools -BuildRequires: python3-six -BuildRequires: python3-sphinx -%if 0%{?fedora} -BuildRequires: python3-pycdlib -%endif %if %{with_resultsdb} BuildRequires: python3-resultsdb_api +BuildRequires: python3-pycdlib %endif %if 0%{?with_tests} BuildRequires: genisoimage BuildRequires: libcdio BuildRequires: psmisc -%if 0%{?fedora} +%if ! 0%{?rhel} BuildRequires: perl-Test-Harness %endif -%if 0%{?fedora} >= 30 || 0%{?rhel} BuildRequires: glibc-all-langpacks -%endif BuildRequires: python3-netifaces BuildRequires: python3-yaml %endif @@ -89,7 +84,8 @@ these days a framework) to perform automated testing. %prep -%setup -q -n %{srcname}-%{gitref} +%setup -q -n avocado-%{gitref} +%patch0 -p 1 %if 0%{?rhel} sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py %endif @@ -99,11 +95,11 @@ sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to pushd optional_plugins/html %py3_build popd -pushd optional_plugins/resultsdb %if %{with_resultsdb} +pushd optional_plugins/resultsdb %py3_build -%endif popd +%endif pushd optional_plugins/varianter_yaml_to_mux %py3_build popd @@ -137,23 +133,26 @@ for exe in \ avocado-runner-requirement-package \ avocado-software-manager do - %{__mv} %{buildroot}%{_bindir}/$exe %{buildroot}%{_bindir}/$exe-%{python3_version} - %{__ln_s} $exe-%{python3_version} %{buildroot}%{_bindir}/$exe-3 - %{__ln_s} $exe-%{python3_version} %{buildroot}%{_bindir}/$exe + mv %{buildroot}%{_bindir}/$exe %{buildroot}%{_bindir}/$exe-%{python3_version} + ln -s $exe-%{python3_version} %{buildroot}%{_bindir}/$exe-3 + ln -s $exe-%{python3_version} %{buildroot}%{_bindir}/$exe done # configuration is held at /etc/avocado only and part of the # python-avocado-common package -%{__rm} -rf %{buildroot}%{python3_sitelib}/avocado/etc +rm -rf %{buildroot}%{python3_sitelib}/avocado/etc # ditto for libexec files -%{__rm} -rf %{buildroot}%{python3_sitelib}/avocado/libexec +rm -rf %{buildroot}%{python3_sitelib}/avocado/libexec +# adjust permissions for file containing shebang line needed for +# spawning tasks in podman containers +chmod -c +x %{buildroot}%{python3_sitelib}/avocado/core/nrunner.py pushd optional_plugins/html %py3_install popd -pushd optional_plugins/resultsdb %if %{with_resultsdb} +pushd optional_plugins/resultsdb %py3_install -%endif popd +%endif pushd optional_plugins/varianter_yaml_to_mux %py3_install popd @@ -170,90 +169,65 @@ pushd optional_plugins/result_upload %py3_install popd # cleanup plugin test cruft -%{__rm} -rf %{buildroot}%{python3_sitelib}/tests -%{__mkdir} -p %{buildroot}%{_sysconfdir}/avocado -%{__cp} -r avocado/etc/avocado/scripts %{buildroot}%{_sysconfdir}/avocado/scripts -%{__cp} -r avocado/etc/avocado/sysinfo %{buildroot}%{_sysconfdir}/avocado/sysinfo -%{__mkdir} -p %{buildroot}%{_libexecdir}/avocado -%{__cp} avocado/libexec/avocado-bash-utils %{buildroot}%{_libexecdir}/avocado/avocado-bash-utils -%{__cp} avocado/libexec/avocado_debug %{buildroot}%{_libexecdir}/avocado/avocado_debug -%{__cp} avocado/libexec/avocado_error %{buildroot}%{_libexecdir}/avocado/avocado_error -%{__cp} avocado/libexec/avocado_info %{buildroot}%{_libexecdir}/avocado/avocado_info -%{__cp} avocado/libexec/avocado_warn %{buildroot}%{_libexecdir}/avocado/avocado_warn -%{__mkdir_p} %{buildroot}%{_mandir}/man1 -%{__install} -m 0644 man/avocado.1 %{buildroot}%{_mandir}/man1/avocado.1 -%{__install} -d -m 0755 %{buildroot}%{_sharedstatedir}/avocado/data +rm -rf %{buildroot}%{python3_sitelib}/tests +mkdir -p %{buildroot}%{_sysconfdir}/avocado +cp -r avocado/etc/avocado/scripts %{buildroot}%{_sysconfdir}/avocado/scripts +cp -r avocado/etc/avocado/sysinfo %{buildroot}%{_sysconfdir}/avocado/sysinfo +mkdir -p %{buildroot}%{_libexecdir}/avocado +cp avocado/libexec/avocado-bash-utils %{buildroot}%{_libexecdir}/avocado/avocado-bash-utils +cp avocado/libexec/avocado_debug %{buildroot}%{_libexecdir}/avocado/avocado_debug +cp avocado/libexec/avocado_error %{buildroot}%{_libexecdir}/avocado/avocado_error +cp avocado/libexec/avocado_info %{buildroot}%{_libexecdir}/avocado/avocado_info +cp avocado/libexec/avocado_warn %{buildroot}%{_libexecdir}/avocado/avocado_warn +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 0644 man/avocado.1 %{buildroot}%{_mandir}/man1/avocado.1 +mkdir -p %{buildroot}%{_pkgdocdir} +install -m 0644 README.rst %{buildroot}%{_pkgdocdir} +install -d -m 0755 %{buildroot}%{_sharedstatedir}/avocado/data # place examples in documentation directory -%{__install} -d -m 0755 %{buildroot}%{_docdir}/avocado -%{__cp} -r examples/gdb-prerun-scripts %{buildroot}%{_docdir}/avocado/gdb-prerun-scripts -%{__cp} -r examples/plugins %{buildroot}%{_docdir}/avocado/plugins -%{__cp} -r examples/tests %{buildroot}%{_docdir}/avocado/tests -%{__cp} -r examples/varianter_cit %{buildroot}%{_docdir}/avocado/varianter_cit -%{__cp} -r examples/varianter_pict %{buildroot}%{_docdir}/avocado/varianter_pict -%{__cp} -r examples/wrappers %{buildroot}%{_docdir}/avocado/wrappers -%{__cp} -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux -find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x {} ';' +install -d -m 0755 %{buildroot}%{_docdir}/avocado +cp -r examples/gdb-prerun-scripts %{buildroot}%{_docdir}/avocado/gdb-prerun-scripts +cp -r examples/plugins %{buildroot}%{_docdir}/avocado/plugins +cp -r examples/tests %{buildroot}%{_docdir}/avocado/tests +cp -r examples/varianter_cit %{buildroot}%{_docdir}/avocado/varianter_cit +cp -r examples/varianter_pict %{buildroot}%{_docdir}/avocado/varianter_pict +cp -r examples/wrappers %{buildroot}%{_docdir}/avocado/wrappers +cp -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux +find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec chmod -c -x {} ';' -%check %if 0%{?with_tests} - %{__python3} setup.py develop --user - pushd optional_plugins/html - %{__python3} setup.py develop --user - popd - %if %{with_resultsdb} - pushd optional_plugins/resultsdb - %{__python3} setup.py develop --user - popd - %endif - # with_resultsdb - pushd optional_plugins/varianter_yaml_to_mux - %{__python3} setup.py develop --user - popd - pushd optional_plugins/golang - %{__python3} setup.py develop --user - popd - pushd optional_plugins/varianter_pict - %{__python3} setup.py develop --user - popd - pushd optional_plugins/varianter_cit - %{__python3} setup.py develop --user - popd - pushd optional_plugins/result_upload - %{__python3} setup.py develop --user - popd +%check # LANG: to make the results predictable, we pin the language # that is used during test execution. # AVOCADO_CHECK_LEVEL: package build environments have the least # amount of resources we have observed so far. Let's avoid tests that # require too much resources or are time sensitive - USER_BASE=`%{__python3} -m site --user-base` - PATH=$USER_BASE/bin:$PATH LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 %{__python3} selftests/check.py --disable-static-checks --disable-plugin-checks=robot + PATH=%{buildroot}%{_bindir}:%{buildroot}%{_libexecdir}/avocado:$PATH \ + PYTHONPATH=%{buildroot}%{python3_sitelib}:. \ + LANG=en_US.UTF-8 \ + AVOCADO_CHECK_LEVEL=0 \ + %{python3} selftests/check.py --disable-static-checks --disable-plugin-checks=robot %endif -%package -n python3-%{pkgname} +%package -n python3-avocado Summary: %{summary} -License: GPLv2 and MIT -%{?python_provide:%python_provide python3-%{pkgname}} -Requires: python-%{pkgname}-common == %{version}-%{release} +Requires: python-avocado-common == %{version}-%{release} Requires: gdb Requires: gdb-gdbserver Requires: procps-ng -Requires: python3 -Requires: python3-setuptools -Requires: python3-six -%if 0%{?fedora} +%if ! 0%{?rhel} Requires: python3-pycdlib %endif -%description -n python3-%{pkgname} +%description -n python3-avocado Avocado is a set of tools and libraries (what people call these days a framework) to perform automated testing. -%files -n python3-%{pkgname} +%files -n python3-avocado %license LICENSE -%doc README.rst +%{_pkgdocdir}/README.rst %{python3_sitelib}/avocado/ %{python3_sitelib}/avocado_framework-%{version}-py%{python3_version}.egg-info %{_bindir}/avocado-%{python3_version} @@ -294,13 +268,15 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-software-manager -%package -n python-%{pkgname}-common +%package -n python-avocado-common Summary: Avocado common files +License: GPLv2+ -%description -n python-%{pkgname}-common +%description -n python-avocado-common Common files (such as configuration) for the Avocado Testing Framework. -%files -n python-%{pkgname}-common +%files -n python-avocado-common +%license LICENSE %{_mandir}/man1/avocado.1.gz %dir %{_docdir}/avocado %dir %{_sharedstatedir}/avocado @@ -317,125 +293,124 @@ Common files (such as configuration) for the Avocado Testing Framework. %{_sysconfdir}/avocado/scripts/job/post.d/README -%package -n python3-%{pkgname}-plugins-output-html +%package -n python3-avocado-plugins-output-html Summary: Avocado HTML report plugin -%{?python_provide:%python_provide python3-%{pkgname}-plugins-output-html} -Requires: python3-%{pkgname} == %{version}-%{release} -Requires: python3-jinja2 +License: GPLv2+ and MIT +Requires: python3-avocado == %{version}-%{release} -%description -n python3-%{pkgname}-plugins-output-html +%description -n python3-avocado-plugins-output-html Adds to avocado the ability to generate an HTML report at every job results directory. It also gives the user the ability to write a report on an arbitrary filesystem location. -%files -n python3-%{pkgname}-plugins-output-html +%files -n python3-avocado-plugins-output-html %{python3_sitelib}/avocado_result_html/ %{python3_sitelib}/avocado_framework_plugin_result_html-%{version}-py%{python3_version}.egg-info %if %{with_resultsdb} -%package -n python3-%{pkgname}-plugins-resultsdb +%package -n python3-avocado-plugins-resultsdb Summary: Avocado plugin to propagate job results to ResultsDB -%{?python_provide:%python_provide python3-%{pkgname}-plugins-resultsdb} -Requires: python3-%{pkgname} == %{version}-%{release} -Requires: python3-resultsdb_api +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} -%description -n python3-%{pkgname}-plugins-resultsdb +%description -n python3-avocado-plugins-resultsdb Allows Avocado to send job results directly to a ResultsDB server. -%files -n python3-%{pkgname}-plugins-resultsdb +%files -n python3-avocado-plugins-resultsdb %{python3_sitelib}/avocado_resultsdb/ %{python3_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python3_version}.egg-info %endif # with_resultsdb -%package -n python3-%{pkgname}-plugins-varianter-yaml-to-mux +%package -n python3-avocado-plugins-varianter-yaml-to-mux Summary: Avocado plugin to generate variants out of yaml files -%{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-yaml-to-mux} -Requires: python3-%{pkgname} == %{version}-%{release} -Requires: python3-yaml +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} -%description -n python3-%{pkgname}-plugins-varianter-yaml-to-mux +%description -n python3-avocado-plugins-varianter-yaml-to-mux Can be used to produce multiple test variants with test parameters defined in a yaml file(s). -%files -n python3-%{pkgname}-plugins-varianter-yaml-to-mux +%files -n python3-avocado-plugins-varianter-yaml-to-mux %{python3_sitelib}/avocado_varianter_yaml_to_mux/ %{python3_sitelib}/avocado_framework_plugin_varianter_yaml_to_mux-%{version}-py%{python3_version}.egg-info -%package -n python3-%{pkgname}-plugins-golang +%package -n python3-avocado-plugins-golang Summary: Avocado plugin for execution of golang tests -%{?python_provide:%python_provide python3-%{pkgname}-plugins-golang} -Requires: python3-%{pkgname} == %{version}-%{release} +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} Requires: golang -%description -n python3-%{pkgname}-plugins-golang +%description -n python3-avocado-plugins-golang Allows Avocado to list golang tests, and if golang is installed, also run them. -%files -n python3-%{pkgname}-plugins-golang +%files -n python3-avocado-plugins-golang %{python3_sitelib}/avocado_golang/ %{python3_sitelib}/avocado_framework_plugin_golang-%{version}-py%{python3_version}.egg-info %{_bindir}/avocado-runner-golang -%package -n python3-%{pkgname}-plugins-varianter-pict -Summary: Varianter with combinatorial capabilities by PICT -%{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-pict} -Requires: python3-%{pkgname} == %{version}-%{release} -%description -n python3-%{pkgname}-plugins-varianter-pict +%package -n python3-avocado-plugins-varianter-pict +Summary: Varianter with combinatorial capabilities by PICT +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} + +%description -n python3-avocado-plugins-varianter-pict This plugin uses a third-party tool to provide variants created by Pair-Wise algorithms, also known as Combinatorial Independent Testing. -%files -n python3-%{pkgname}-plugins-varianter-pict +%files -n python3-avocado-plugins-varianter-pict %{python3_sitelib}/avocado_varianter_pict/ %{python3_sitelib}/avocado_framework_plugin_varianter_pict-%{version}-py%{python3_version}.egg-info -%package -n python3-%{pkgname}-plugins-varianter-cit +%package -n python3-avocado-plugins-varianter-cit Summary: Varianter with Combinatorial Independent Testing capabilities -%{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-cit} -Requires: python3-%{pkgname} == %{version}-%{release} +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} -%description -n python3-%{pkgname}-plugins-varianter-cit +%description -n python3-avocado-plugins-varianter-cit A varianter plugin that generates variants using Combinatorial Independent Testing (AKA Pair-Wise) algorithm developed in collaboration with CVUT Prague. -%files -n python3-%{pkgname}-plugins-varianter-cit +%files -n python3-avocado-plugins-varianter-cit %{python3_sitelib}/avocado_varianter_cit/ %{python3_sitelib}/avocado_framework_plugin_varianter_cit-%{version}-py%{python3_version}.egg-info -%package -n python3-%{pkgname}-plugins-result-upload +%package -n python3-avocado-plugins-result-upload Summary: Avocado plugin propagate job results to a remote host -%{?python_provide:%python_provide python3-%{pkgname}-plugins-result-upload} -Requires: python3-%{pkgname} == %{version}-%{release} +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} -%description -n python3-%{pkgname}-plugins-result-upload +%description -n python3-avocado-plugins-result-upload This optional plugin is intended to upload the Avocado Job results to a dedicated sever. -%files -n python3-%{pkgname}-plugins-result-upload +%files -n python3-avocado-plugins-result-upload %{python3_sitelib}/avocado_result_upload/ %{python3_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python3_version}.egg-info -%package -n python-%{pkgname}-examples +%package -n python-avocado-examples Summary: Avocado Test Framework Example Tests -License: GPLv2 +License: GPLv2+ # documentation does not require main package, but needs to be in lock-step if present -Conflicts: python3-%{pkgname} < %{version}-%{release}, python3-%{pkgname} > %{version}-%{release} +Conflicts: python3-avocado < %{version}-%{release}, python3-avocado > %{version}-%{release} -%description -n python-%{pkgname}-examples +%description -n python-avocado-examples The set of example tests present in the upstream tree of the Avocado framework. Some of them are used as functional tests of the framework, others serve as examples of how to write tests on your own. -%files -n python-%{pkgname}-examples +%files -n python-avocado-examples +%license LICENSE %dir %{_docdir}/avocado %{_docdir}/avocado/gdb-prerun-scripts %{_docdir}/avocado/plugins @@ -446,15 +421,17 @@ examples of how to write tests on your own. %{_docdir}/avocado/yaml_to_mux -%package -n python-%{pkgname}-bash +%package -n python-avocado-bash Summary: Avocado Test Framework Bash Utilities -Requires: python-%{pkgname}-common == %{version}-%{release} +License: GPLv2+ and GPLv2 +Requires: python-avocado-common == %{version}-%{release} -%description -n python-%{pkgname}-bash +%description -n python-avocado-bash A small set of utilities to interact with Avocado from the Bourne Again Shell code (and possibly other similar shells). -%files -n python-%{pkgname}-bash +%files -n python-avocado-bash +%license LICENSE %dir %{_libexecdir}/avocado %{_libexecdir}/avocado/avocado-bash-utils %{_libexecdir}/avocado/avocado_debug @@ -464,6 +441,10 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Jun 29 2021 Merlin Mathesius - 89.0-2 +- Spec file cleanup identified during package review to bring back + non-modular version of package. + * Tue Jun 22 2021 Cleber Rosa - 89.0-1 - Sync with upstream release 89.0. - Packaged avocado-runner-dry-run and avocado-runner-requirement-asset From abde5697f4d455023a5f616878f646311ec7fd6b Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 27 Jul 2021 15:00:46 -0400 Subject: [PATCH 09/17] Sync with upstream release 90.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 68e83ee..c546198 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /avocado-87.0.tar.gz /avocado-88.1.tar.gz /avocado-89.0.tar.gz +/avocado-90.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 86ea66d..8e5def7 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -9,10 +9,10 @@ %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 5c5e83340a6041cf470186c48be9d50cb07f9486 + %global commit 1aa47c413edb406734d95faffc2b347988249100 %endif %if ! 0%{?commit_date:1} - %global commit_date 20210621 + %global commit_date 20210727 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -34,8 +34,8 @@ %endif Name: python-avocado -Version: 89.0 -Release: 2%{?gitrel}%{?dist} +Version: 90.0 +Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: # avocado/core/tapparser.py: MIT @@ -48,8 +48,6 @@ Summary: Framework with tools and libraries for Automated Testing License: GPLv2+ and GPLv2 and MIT URL: https://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/avocado/archive/%{gitref}/%{gittar} -# Patch from https://github.com/avocado-framework/avocado/pull/4759 -Patch0: avocado-89.0-passtest-path-fix.patch BuildArch: noarch BuildRequires: kmod @@ -85,7 +83,6 @@ these days a framework) to perform automated testing. %prep %setup -q -n avocado-%{gitref} -%patch0 -p 1 %if 0%{?rhel} sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py %endif @@ -441,6 +438,10 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Jul 27 2021 Cleber Rosa - 90.0-1 +- Sync with upstream release 90.0. +- Removed patch already included upstream + * Tue Jun 29 2021 Merlin Mathesius - 89.0-2 - Spec file cleanup identified during package review to bring back non-modular version of package. diff --git a/sources b/sources index 8a82bb6..03d7c96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-89.0.tar.gz) = 37b7545da4c7b2a5fd073de0212bce66ea2a93e45e513f10769b2ee305071e9c5cd8fa54cfd81209d1c62a9c0a9da069890808a701344ecd06515622b87baec3 +SHA512 (avocado-90.0.tar.gz) = 3aef3e8d0eff03c6239169cc06b5d7195be9b086595cd57fd7abd4834ebaf32974fdb05b867725cc8f8f91f35ef3ae61468cff23b97f3cf910a3c1b03f7a29b8 From 0df2004e57308bd41864206aa380ae20de83ba6f Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Fri, 18 Mar 2022 13:52:43 -0400 Subject: [PATCH 10/17] Sync with upstream release 95.0 Signed-off-by: Cleber Rosa --- .gitignore | 2 ++ python-avocado.spec | 53 ++++++++++++++++++++++++++++++--------------- sources | 3 ++- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index c546198..cea2ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ /avocado-88.1.tar.gz /avocado-89.0.tar.gz /avocado-90.0.tar.gz +/avocado-95.0.tar.gz +/avocado-95.0-resultsdb_api.patch diff --git a/python-avocado.spec b/python-avocado.spec index 8e5def7..be3d8e5 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -9,10 +9,10 @@ %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 1aa47c413edb406734d95faffc2b347988249100 + %global commit 695ef39fe47e074b5349051e2866edeb3f017b94 %endif %if ! 0%{?commit_date:1} - %global commit_date 20210727 + %global commit_date 20220209 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -24,17 +24,19 @@ # the functional tests are time and resource sensitive and can # cause race conditions and random build failures. They are # enabled by default. -%global with_tests 1 +# You can disable them with rpmbuild ... --without tests +%bcond_without tests -# resultsdb is not available for RHEL -%if ! 0%{?rhel} +# Only Fedora 36 and later have a suitable python3-resutlsdb_api +# package +%if 0%{?fedora} >= 36 %global with_resultsdb 1 %else %global with_resultsdb 0 %endif Name: python-avocado -Version: 90.0 +Version: 95.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -48,6 +50,7 @@ Summary: Framework with tools and libraries for Automated Testing License: GPLv2+ and GPLv2 and MIT URL: https://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/avocado/archive/%{gitref}/%{gittar} +Patch0: avocado-95.0-resultsdb_api.patch BuildArch: noarch BuildRequires: kmod @@ -63,8 +66,10 @@ BuildRequires: python3-resultsdb_api BuildRequires: python3-pycdlib %endif -%if 0%{?with_tests} +%if %{with tests} +%if ! 0%{?rhel} >= 9 BuildRequires: genisoimage +%endif BuildRequires: libcdio BuildRequires: psmisc %if ! 0%{?rhel} @@ -74,7 +79,7 @@ BuildRequires: glibc-all-langpacks BuildRequires: python3-netifaces BuildRequires: python3-yaml %endif -# with_tests +# with tests %description Avocado is a set of tools and libraries (what people call @@ -83,6 +88,7 @@ these days a framework) to perform automated testing. %prep %setup -q -n avocado-%{gitref} +%patch0 -p 1 %if 0%{?rhel} sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py %endif @@ -121,13 +127,14 @@ for exe in \ avocado-runner \ avocado-runner-noop \ avocado-runner-dry-run \ - avocado-runner-exec \ avocado-runner-exec-test \ avocado-runner-python-unittest \ avocado-runner-avocado-instrumented \ avocado-runner-tap \ avocado-runner-requirement-asset \ avocado-runner-requirement-package \ + avocado-runner-sysinfo \ + avocado-external-runner \ avocado-software-manager do mv %{buildroot}%{_bindir}/$exe %{buildroot}%{_bindir}/$exe-%{python3_version} @@ -139,9 +146,6 @@ done rm -rf %{buildroot}%{python3_sitelib}/avocado/etc # ditto for libexec files rm -rf %{buildroot}%{python3_sitelib}/avocado/libexec -# adjust permissions for file containing shebang line needed for -# spawning tasks in podman containers -chmod -c +x %{buildroot}%{python3_sitelib}/avocado/core/nrunner.py pushd optional_plugins/html %py3_install popd @@ -193,7 +197,7 @@ cp -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec chmod -c -x {} ';' -%if 0%{?with_tests} +%if %{with tests} %check # LANG: to make the results predictable, we pin the language # that is used during test execution. @@ -204,7 +208,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec chmod -c -x {} '; PYTHONPATH=%{buildroot}%{python3_sitelib}:. \ LANG=en_US.UTF-8 \ AVOCADO_CHECK_LEVEL=0 \ - %{python3} selftests/check.py --disable-static-checks --disable-plugin-checks=robot + %{python3} selftests/check.py --skip static-checks --disable-plugin-checks robot %endif @@ -239,9 +243,6 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-dry-run-%{python3_version} %{_bindir}/avocado-runner-dry-run-3 %{_bindir}/avocado-runner-dry-run -%{_bindir}/avocado-runner-exec-%{python3_version} -%{_bindir}/avocado-runner-exec-3 -%{_bindir}/avocado-runner-exec %{_bindir}/avocado-runner-exec-test-%{python3_version} %{_bindir}/avocado-runner-exec-test-3 %{_bindir}/avocado-runner-exec-test @@ -260,9 +261,15 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-requirement-package-%{python3_version} %{_bindir}/avocado-runner-requirement-package-3 %{_bindir}/avocado-runner-requirement-package +%{_bindir}/avocado-runner-sysinfo-%{python3_version} +%{_bindir}/avocado-runner-sysinfo-3 +%{_bindir}/avocado-runner-sysinfo %{_bindir}/avocado-software-manager-%{python3_version} %{_bindir}/avocado-software-manager-3 %{_bindir}/avocado-software-manager +%{_bindir}/avocado-external-runner-%{python3_version} +%{_bindir}/avocado-external-runner-3 +%{_bindir}/avocado-external-runner %package -n python-avocado-common @@ -438,6 +445,18 @@ Again Shell code (and possibly other similar shells). %changelog +* Thu Mar 17 2022 Cleber Rosa - 95.0-1 +- Sync with upstream release 95.0. +- Added new binary for 'avocado-external-runner' +- Removed executable mode from avocado/core/nrunner.py +- Adjust selftest/check.py to use new --skip option +- Do not require genisoimage on EL9 +- Replace the %global with_tests macro with %bcond_without to allow + disable the tests directly in the command line. +- Removed avocado-runner-exec since we have avocado-runner-exec-test. +- Added avocado-runner-sysinfo in package +- Added upstream patch that pins resultsdb_api to working version. + * Tue Jul 27 2021 Cleber Rosa - 90.0-1 - Sync with upstream release 90.0. - Removed patch already included upstream diff --git a/sources b/sources index 03d7c96..c62d572 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (avocado-90.0.tar.gz) = 3aef3e8d0eff03c6239169cc06b5d7195be9b086595cd57fd7abd4834ebaf32974fdb05b867725cc8f8f91f35ef3ae61468cff23b97f3cf910a3c1b03f7a29b8 +SHA512 (avocado-95.0-resultsdb_api.patch) = fd62130106eb67d71102e9c33935ae424c92ec6d8a27ab35e856f1449c51a4bc7d6ac768b67fdd95ec894ed57b60ca0aa6fea00ccbd378c93696636c14d7b001 +SHA512 (avocado-95.0.tar.gz) = 12d831c002f1e808c75b86008d08a78a98fb473b58d655876312343721548601604579d6ca2fc4a91fc33f91925de055697541458b72fc8f12a56170a35da7ef From 110dbb63931db99af1ce0da21ec97f60758b8f01 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 5 Apr 2022 17:05:14 -0400 Subject: [PATCH 11/17] Sync with upstream release 96.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 29 ++++++++++++++++------------- sources | 3 +-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index cea2ad1..63579c2 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /avocado-90.0.tar.gz /avocado-95.0.tar.gz /avocado-95.0-resultsdb_api.patch +/avocado-96.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index be3d8e5..7f89e75 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -9,10 +9,10 @@ %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 695ef39fe47e074b5349051e2866edeb3f017b94 + %global commit 6f3980f8f81d41d944cd826ae2a96ae52d972e19 %endif %if ! 0%{?commit_date:1} - %global commit_date 20220209 + %global commit_date 20220405 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -36,7 +36,7 @@ %endif Name: python-avocado -Version: 95.0 +Version: 96.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -50,7 +50,6 @@ Summary: Framework with tools and libraries for Automated Testing License: GPLv2+ and GPLv2 and MIT URL: https://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/avocado/archive/%{gitref}/%{gittar} -Patch0: avocado-95.0-resultsdb_api.patch BuildArch: noarch BuildRequires: kmod @@ -88,7 +87,6 @@ these days a framework) to perform automated testing. %prep %setup -q -n avocado-%{gitref} -%patch0 -p 1 %if 0%{?rhel} sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py %endif @@ -131,8 +129,8 @@ for exe in \ avocado-runner-python-unittest \ avocado-runner-avocado-instrumented \ avocado-runner-tap \ - avocado-runner-requirement-asset \ - avocado-runner-requirement-package \ + avocado-runner-asset \ + avocado-runner-package \ avocado-runner-sysinfo \ avocado-external-runner \ avocado-software-manager @@ -255,12 +253,12 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-tap-%{python3_version} %{_bindir}/avocado-runner-tap-3 %{_bindir}/avocado-runner-tap -%{_bindir}/avocado-runner-requirement-asset-%{python3_version} -%{_bindir}/avocado-runner-requirement-asset-3 -%{_bindir}/avocado-runner-requirement-asset -%{_bindir}/avocado-runner-requirement-package-%{python3_version} -%{_bindir}/avocado-runner-requirement-package-3 -%{_bindir}/avocado-runner-requirement-package +%{_bindir}/avocado-runner-asset-%{python3_version} +%{_bindir}/avocado-runner-asset-3 +%{_bindir}/avocado-runner-asset +%{_bindir}/avocado-runner-package-%{python3_version} +%{_bindir}/avocado-runner-package-3 +%{_bindir}/avocado-runner-package %{_bindir}/avocado-runner-sysinfo-%{python3_version} %{_bindir}/avocado-runner-sysinfo-3 %{_bindir}/avocado-runner-sysinfo @@ -445,6 +443,11 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Apr 5 2022 Cleber Rosa - 96.0-1 +- Sync with upstream release 96.0. +- Rename requirements to dependencies +- Dropped patch that pins resultsdb_api to working version + * Thu Mar 17 2022 Cleber Rosa - 95.0-1 - Sync with upstream release 95.0. - Added new binary for 'avocado-external-runner' diff --git a/sources b/sources index c62d572..8bd980d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (avocado-95.0-resultsdb_api.patch) = fd62130106eb67d71102e9c33935ae424c92ec6d8a27ab35e856f1449c51a4bc7d6ac768b67fdd95ec894ed57b60ca0aa6fea00ccbd378c93696636c14d7b001 -SHA512 (avocado-95.0.tar.gz) = 12d831c002f1e808c75b86008d08a78a98fb473b58d655876312343721548601604579d6ca2fc4a91fc33f91925de055697541458b72fc8f12a56170a35da7ef +SHA512 (avocado-96.0.tar.gz) = 66ccfa435381887e91db55d5929f7d237ae947587453bd0266330d3a847aa75b8c65a27871f10c79244b4a4d03c2fd6fd2c49e8d52620d7f9f03caa6373540a9 From 34e099cd8b670628fd004c1771bb9409d3e6a79f Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 24 May 2022 16:51:56 -0400 Subject: [PATCH 12/17] Sync with upstream release 97.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 63579c2..0b863a0 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /avocado-95.0.tar.gz /avocado-95.0-resultsdb_api.patch /avocado-96.0.tar.gz +/avocado-97.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 7f89e75..312b7ab 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -9,10 +9,10 @@ %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 6f3980f8f81d41d944cd826ae2a96ae52d972e19 + %global commit edd8acc0d38a27d69b1820251f8bd52102415f52 %endif %if ! 0%{?commit_date:1} - %global commit_date 20220405 + %global commit_date 20220524 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -36,7 +36,7 @@ %endif Name: python-avocado -Version: 96.0 +Version: 97.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -66,6 +66,7 @@ BuildRequires: python3-pycdlib %endif %if %{with tests} +BuildRequires: python3-jsonschema %if ! 0%{?rhel} >= 9 BuildRequires: genisoimage %endif @@ -190,7 +191,6 @@ cp -r examples/plugins %{buildroot}%{_docdir}/avocado/plugins cp -r examples/tests %{buildroot}%{_docdir}/avocado/tests cp -r examples/varianter_cit %{buildroot}%{_docdir}/avocado/varianter_cit cp -r examples/varianter_pict %{buildroot}%{_docdir}/avocado/varianter_pict -cp -r examples/wrappers %{buildroot}%{_docdir}/avocado/wrappers cp -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec chmod -c -x {} ';' @@ -419,7 +419,6 @@ examples of how to write tests on your own. %{_docdir}/avocado/tests %{_docdir}/avocado/varianter_cit %{_docdir}/avocado/varianter_pict -%{_docdir}/avocado/wrappers %{_docdir}/avocado/yaml_to_mux @@ -443,6 +442,11 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue May 24 2022 Cleber Rosa - 97.0-1 +- Sync with upstream release 97.0 +- Require python3-jsonschema when running tests +- Removed wrapper examples + * Tue Apr 5 2022 Cleber Rosa - 96.0-1 - Sync with upstream release 96.0. - Rename requirements to dependencies diff --git a/sources b/sources index 8bd980d..1e510b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-96.0.tar.gz) = 66ccfa435381887e91db55d5929f7d237ae947587453bd0266330d3a847aa75b8c65a27871f10c79244b4a4d03c2fd6fd2c49e8d52620d7f9f03caa6373540a9 +SHA512 (avocado-97.0.tar.gz) = 8436558563ce6648179a3f4939eec957798c665744e5f5c2b8d96ae9213dac19307a8d6bb6eebb84a752e3f3daf440e0ed27b1c81df5d8d607370faaa024e052 From 4adc731d212bd96eed43618aa109ecad4c042abc Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Sat, 16 Jul 2022 12:41:28 -0400 Subject: [PATCH 13/17] Sync gdbtest.py with latest upstream Signed-off-by: Cleber Rosa --- tests/gdbtest.py | 122 ++++++++++++++--------------------------------- 1 file changed, 35 insertions(+), 87 deletions(-) diff --git a/tests/gdbtest.py b/tests/gdbtest.py index d814fa5..c0cdc55 100755 --- a/tests/gdbtest.py +++ b/tests/gdbtest.py @@ -1,14 +1,7 @@ -#!/usr/bin/env python - import os -from six.moves import xrange as range - from avocado import Test -from avocado import main -from avocado.utils import gdb -from avocado.utils import genio -from avocado.utils import process +from avocado.utils import gdb, genio, process class GdbTest(Test): @@ -32,17 +25,22 @@ class GdbTest(Test): "-auto-debug-it"] def setUp(self): - return99_source_path = os.path.join(self.datadir, 'return99.c') - segfault_source_path = os.path.join(self.datadir, 'segfault.c') - self.return99_binary_path = os.path.join(self.outputdir, 'return99') - process.system('gcc -O0 -g %s -o %s' % (return99_source_path, - self.return99_binary_path)) - self.segfault_binary_path = os.path.join(self.outputdir, 'segfault') - process.system('gcc -O0 -g %s -o %s' % (segfault_source_path, - self.segfault_binary_path)) + self.return99_binary_path = os.path.join(self.teststmpdir, 'return99') + if not os.path.exists(self.return99_binary_path): + return99_source_path = self.get_data('return99.c') + if return99_source_path is None: + self.cancel('Test is missing data file "return99.c"') + process.system(f'gcc -O0 -g {return99_source_path} -o {self.return99_binary_path}') + + self.segfault_binary_path = os.path.join(self.teststmpdir, 'segfault') + if not os.path.exists(self.segfault_binary_path): + segfault_source_path = self.get_data('segfault.c') + if segfault_source_path is None: + self.cancel('Test is missing data file "segfault.c"') + process.system(f'gcc -O0 -g {segfault_source_path} -o {self.segfault_binary_path}') @staticmethod - def is_process_alive(process): + def is_process_alive(process): # pylint: disable=W0621 """ Checks if a process is still alive @@ -73,14 +71,14 @@ class GdbTest(Test): g = gdb.GDB() self.log.info("Testing existing (valid) GDB commands using raw commands") for cmd in self.VALID_CMDS: - info_cmd = "-info-gdb-mi-command %s" % cmd[1:] + info_cmd = f"-info-gdb-mi-command {cmd[1:]}" r = g.cmd(info_cmd) self.assertEqual(r.result.result.command.exists, 'true') self.log.info("Testing non-existing (invalid) GDB commands using raw " "commands") for cmd in self.INVALID_CMDS: - info_cmd = "-info-gdb-mi-command %s" % cmd[1:] + info_cmd = f"-info-gdb-mi-command {cmd[1:]}" r = g.cmd(info_cmd) self.assertEqual(r.result.result.command.exists, 'false') @@ -105,7 +103,7 @@ class GdbTest(Test): self.log.info("Testing that GDB loads a file and sets a breakpoint") g = gdb.GDB() - file_cmd = "-file-exec-and-symbols %s" % self.return99_binary_path + file_cmd = f"-file-exec-and-symbols {self.return99_binary_path}" r = g.cmd(file_cmd) self.assertEqual(r.result.class_, 'done') @@ -145,7 +143,7 @@ class GdbTest(Test): self.log.info("Testing that a core dump will be generated") g = gdb.GDB() - file_cmd = "-file-exec-and-symbols %s" % self.segfault_binary_path + file_cmd = f"-file-exec-and-symbols {self.segfault_binary_path}" r = g.cmd(file_cmd) self.assertEqual(r.result.class_, 'done') @@ -156,12 +154,12 @@ class GdbTest(Test): other_messages = g.read_until_break() core_path = None for msg in other_messages: - parsed_msg = gdb.parse_mi(msg) + parsed_msg = gdb.parse_mi(msg.decode()) if (hasattr(parsed_msg, 'class_') and (parsed_msg.class_ == 'stopped') and (parsed_msg.result.signal_name == 'SIGSEGV')): - core_path = "%s.core" % self.segfault_binary_path - gcore_cmd = 'gcore %s' % core_path + core_path = f"{self.segfault_binary_path}.core" + gcore_cmd = f'gcore {core_path}' gcore_cmd = gdb.encode_mi_cli(gcore_cmd) r = g.cmd(gcore_cmd) self.assertEqual(r.result.class_, 'done') @@ -191,14 +189,14 @@ class GdbTest(Test): # Do 100 cycle of target (kind of connects) and disconnects for _ in range(0, 100): - cmd = '-target-select extended-remote :%s' % s.port + cmd = f'-target-select extended-remote :{s.port}' r = g.cmd(cmd) self.assertEqual(r.result.class_, 'connected') r = g.cmd('-target-disconnect') self.assertEqual(r.result.class_, 'done') # manual server shutdown - cmd = '-target-select extended-remote :%s' % s.port + cmd = f'-target-select extended-remote :{s.port}' r = g.cmd(cmd) self.assertEqual(r.result.class_, 'connected') r = g.cli_cmd('monitor exit') @@ -234,15 +232,15 @@ class GdbTest(Test): s = gdb.GDBServer() g = gdb.GDB() - cmd = '-file-exec-and-symbols %s' % self.return99_binary_path + cmd = f'-file-exec-and-symbols {self.return99_binary_path}' r = g.cmd(cmd) self.assertEqual(r.result.class_, 'done') - cmd = 'set remote exec-file %s' % self.return99_binary_path + cmd = f'set remote exec-file {self.return99_binary_path}' r = g.cmd(cmd) self.assertEqual(r.result.class_, 'done') - cmd = "-break-insert %s" % 'main' + cmd = f"-break-insert {'main'}" r = g.cmd(cmd) self.assertEqual(r.result.class_, 'done') @@ -250,7 +248,7 @@ class GdbTest(Test): other_messages = g.read_until_break() for msg in other_messages: - parsed_msg = gdb.parse_mi(msg) + parsed_msg = gdb.parse_mi(msg.decode()) if (hasattr(parsed_msg, 'class_') and parsed_msg.class_ == 'stopped' and parsed_msg.result.reason == 'breakpoint-hit'): @@ -278,7 +276,8 @@ class GdbTest(Test): c1 = gdb.GDB() c1.connect(s.port) c2 = gdb.GDB() - self.assertRaises(ValueError, c2.connect, s.port) + with self.assertRaises(gdb.UnexpectedResponseError): + c2.connect(s.port) s.exit() def test_server_exit(self): @@ -310,43 +309,6 @@ class GdbTest(Test): server_instances[i].exit() self.assertFalse(self.is_process_alive(server_instances[i].process)) - def test_interactive(self): - """ - Tests avocado's GDB plugin features - - If GDB command line options are given, `--gdb-run-bin=return99` for - this particular test, the test will stop at binary main() function. - """ - self.log.info('Testing GDB interactivity') - process.run(self.return99_binary_path, ignore_status=True) - - def test_interactive_args(self): - """ - Tests avocado's GDB plugin features with an executable and args - - If GDB command line options are given, `--gdb-run-bin=return99` for - this particular test, the test will stop at binary main() function. - - This test uses `process.run()` without an `ignore_status` parameter - """ - self.log.info('Testing GDB interactivity with arguments') - result = process.run("%s 0" % self.return99_binary_path) - self.assertEqual(result.exit_status, 0) - - def test_exit_status(self): - """ - Tests avocado's GDB plugin features - - If GDB command line options are given, `--gdb-run-bin=return99` for - this particular test, the test will stop at binary main() function. - """ - self.log.info('Testing process exit statuses') - for arg, exp in [(-1, 255), (8, 8)]: - self.log.info('Expecting exit status "%s"', exp) - cmd = "%s %s" % (self.return99_binary_path, arg) - result = process.run(cmd, ignore_status=True) - self.assertEqual(result.exit_status, exp) - def test_server_stderr(self): self.log.info('Testing server stderr collection') s = gdb.GDBServer() @@ -354,7 +316,7 @@ class GdbTest(Test): self.assertTrue(os.path.exists(s.stderr_path)) stderr_lines = genio.read_all_lines(s.stderr_path) - listening_line = "Listening on port %s" % s.port + listening_line = f"Listening on port {s.port}" self.assertIn(listening_line, stderr_lines) def test_server_stdout(self): @@ -372,28 +334,14 @@ class GdbTest(Test): stdout_lines = genio.read_all_lines(s.stdout_path) self.assertIn("return 99", stdout_lines) - def test_interactive_stdout(self): - """ - Tests avocado's GDB plugin features - - If GDB command line options are given, `--gdb-run-bin=return99` for - this particular test, the test will stop at binary main() function. - """ - self.log.info('Testing GDB interactivity') - result = process.run(self.return99_binary_path, ignore_status=True) - self.assertIn("return 99\n", result.stdout) - - def test_remote(self): + @staticmethod + def test_remote(): """ Tests GDBRemote interaction with a GDBServer """ s = gdb.GDBServer() r = gdb.GDBRemote('127.0.0.1', s.port) r.connect() - r.cmd("qSupported") - r.cmd("qfThreadInfo") + r.cmd(b"qSupported") + r.cmd(b"qfThreadInfo") s.exit() - - -if __name__ == '__main__': - main() From f981628259da6de8a0b8b8a778c75e42332d22d8 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Sat, 16 Jul 2022 12:41:29 -0400 Subject: [PATCH 14/17] Sync with upstream release 98.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 16 ++++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0b863a0..da5fe2e 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /avocado-95.0-resultsdb_api.patch /avocado-96.0.tar.gz /avocado-97.0.tar.gz +/avocado-98.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 312b7ab..d8f59c3 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -9,10 +9,10 @@ %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit edd8acc0d38a27d69b1820251f8bd52102415f52 + %global commit 027faa19aba070f7697690cf0b946f6e94ee6bb2 %endif %if ! 0%{?commit_date:1} - %global commit_date 20220524 + %global commit_date 20221714 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -36,7 +36,7 @@ %endif Name: python-avocado -Version: 97.0 +Version: 98.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -74,6 +74,8 @@ BuildRequires: libcdio BuildRequires: psmisc %if ! 0%{?rhel} BuildRequires: perl-Test-Harness +BuildRequires: python3-elementpath +BuildRequires: python3-xmlschema %endif BuildRequires: glibc-all-langpacks BuildRequires: python3-netifaces @@ -89,7 +91,7 @@ these days a framework) to perform automated testing. %prep %setup -q -n avocado-%{gitref} %if 0%{?rhel} -sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py +sed -e 's/"PyYAML>=4.2b2"/"PyYAML>=3.12"/' -i optional_plugins/varianter_yaml_to_mux/setup.py %endif %build @@ -442,6 +444,12 @@ Again Shell code (and possibly other similar shells). %changelog +* Sat Jul 16 2022 Cleber Rosa - 98.0-1 +- Sync with upstream release 98.0 +- Add build requirements for python3-elementpath and + python3-xmlschema, used on some tests +- Changed regex to match new string quote style + * Tue May 24 2022 Cleber Rosa - 97.0-1 - Sync with upstream release 97.0 - Require python3-jsonschema when running tests diff --git a/sources b/sources index 1e510b6..c029b01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-97.0.tar.gz) = 8436558563ce6648179a3f4939eec957798c665744e5f5c2b8d96ae9213dac19307a8d6bb6eebb84a752e3f3daf440e0ed27b1c81df5d8d607370faaa024e052 +SHA512 (avocado-98.0.tar.gz) = 6e1adbc5a797a7775204418411a7d80afdce1626894ebe054072b22426f41ba5f6544720f83169158bdb3187bd2432387622f8a654d750d49784a183148ed2f0 From 9781dbb34b2bd9daa686323aaec1e108c55a2d1b Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Mon, 17 Jul 2023 19:11:20 -0400 Subject: [PATCH 15/17] Sync with upstream release 102.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 45 ++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index da5fe2e..aed8c8e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /avocado-96.0.tar.gz /avocado-97.0.tar.gz /avocado-98.0.tar.gz +/avocado-102.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index d8f59c3..8dc86ad 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -36,7 +36,7 @@ %endif Name: python-avocado -Version: 98.0 +Version: 102.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -76,6 +76,7 @@ BuildRequires: psmisc BuildRequires: perl-Test-Harness BuildRequires: python3-elementpath BuildRequires: python3-xmlschema +BuildRequires: ansible-core %endif BuildRequires: glibc-all-langpacks BuildRequires: python3-netifaces @@ -110,6 +111,11 @@ popd pushd optional_plugins/golang %py3_build popd +%if ! 0%{?rhel} +pushd optional_plugins/ansible + %py3_build +popd +%endif pushd optional_plugins/varianter_pict %py3_build popd @@ -125,7 +131,6 @@ rst2man man/avocado.rst man/avocado.1 %py3_install for exe in \ avocado \ - avocado-runner \ avocado-runner-noop \ avocado-runner-dry-run \ avocado-runner-exec-test \ @@ -134,6 +139,7 @@ for exe in \ avocado-runner-tap \ avocado-runner-asset \ avocado-runner-package \ + avocado-runner-podman-image \ avocado-runner-sysinfo \ avocado-external-runner \ avocado-software-manager @@ -161,6 +167,11 @@ popd pushd optional_plugins/golang %py3_install popd +%if ! 0%{?rhel} +pushd optional_plugins/ansible + %py3_install +popd +%endif pushd optional_plugins/varianter_pict %py3_install popd @@ -234,9 +245,6 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-%{python3_version} %{_bindir}/avocado-3 %{_bindir}/avocado -%{_bindir}/avocado-runner-%{python3_version} -%{_bindir}/avocado-runner-3 -%{_bindir}/avocado-runner %{_bindir}/avocado-runner-noop-%{python3_version} %{_bindir}/avocado-runner-noop-3 %{_bindir}/avocado-runner-noop @@ -261,6 +269,9 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-package-%{python3_version} %{_bindir}/avocado-runner-package-3 %{_bindir}/avocado-runner-package +%{_bindir}/avocado-runner-podman-image-%{python3_version} +%{_bindir}/avocado-runner-podman-image-3 +%{_bindir}/avocado-runner-podman-image %{_bindir}/avocado-runner-sysinfo-%{python3_version} %{_bindir}/avocado-runner-sysinfo-3 %{_bindir}/avocado-runner-sysinfo @@ -359,6 +370,24 @@ also run them. %{_bindir}/avocado-runner-golang +%if ! 0%{?rhel} +%package -n python3-avocado-plugins-ansible +Summary: Avocado Ansible Dependency plugin +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} +Requires: ansible-core + +%description -n python3-avocado-plugins-ansible +Adds to Avocado the ability to use ansible modules as dependecies for +tests. + +%files -n python3-avocado-plugins-ansible +%{python3_sitelib}/avocado_ansible* +%{python3_sitelib}/avocado_framework_plugin_ansible* +%{_bindir}/avocado-runner-ansible-module +%endif + + %package -n python3-avocado-plugins-varianter-pict Summary: Varianter with combinatorial capabilities by PICT License: GPLv2+ @@ -444,6 +473,12 @@ Again Shell code (and possibly other similar shells). %changelog +* Mon Jul 17 2023 Cleber Rosa - 102.0-1 +- Sync with upstream release 102.0 +- Added new avocado-runner-podman-image script +- Added new sub package python3-avocado-plugins-ansible +- Remove generic runner avocado-runner + * Sat Jul 16 2022 Cleber Rosa - 98.0-1 - Sync with upstream release 98.0 - Add build requirements for python3-elementpath and diff --git a/sources b/sources index c029b01..df8cd21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-98.0.tar.gz) = 6e1adbc5a797a7775204418411a7d80afdce1626894ebe054072b22426f41ba5f6544720f83169158bdb3187bd2432387622f8a654d750d49784a183148ed2f0 +SHA512 (avocado-102.0.tar.gz) = 8c772fd4bef31ed04072e52a88a1d3af7bd28021573d138beacac270774e89b801f8430e80e46453a6c8dc51fe4472310d294271a1e801fbb31dc1dae2b7b1c3 From 5984dca5912a1af67ffe855aff0cbee43723acbc Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Mon, 13 Oct 2025 13:18:44 -0400 Subject: [PATCH 16/17] Sync with upstream release 112.0 Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 88 ++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 85 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index aed8c8e..b6da59d 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /avocado-97.0.tar.gz /avocado-98.0.tar.gz /avocado-102.0.tar.gz +/avocado-112.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 8dc86ad..62fe7d9 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -9,10 +9,10 @@ %global gittar avocado-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 027faa19aba070f7697690cf0b946f6e94ee6bb2 + %global commit e4ede79f097dcc1dbd30e43ffe3b7daf52d2204d %endif %if ! 0%{?commit_date:1} - %global commit_date 20221714 + %global commit_date 20251010 %endif %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} @@ -36,7 +36,7 @@ %endif Name: python-avocado -Version: 102.0 +Version: 112.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -60,6 +60,9 @@ BuildRequires: python3-jinja2 BuildRequires: python3-lxml BuildRequires: python3-psutil BuildRequires: python3-setuptools +%if ! 0%{?rhel} +BuildRequires: python-aexpect +%endif %if %{with_resultsdb} BuildRequires: python3-resultsdb_api BuildRequires: python3-pycdlib @@ -74,13 +77,16 @@ BuildRequires: libcdio BuildRequires: psmisc %if ! 0%{?rhel} BuildRequires: perl-Test-Harness -BuildRequires: python3-elementpath BuildRequires: python3-xmlschema BuildRequires: ansible-core %endif BuildRequires: glibc-all-langpacks BuildRequires: python3-netifaces BuildRequires: python3-yaml +BuildRequires: nmap-ncat +BuildRequires: gcc +BuildRequires: gdb +BuildRequires: gdb-gdbserver %endif # with tests @@ -94,6 +100,10 @@ these days a framework) to perform automated testing. %if 0%{?rhel} sed -e 's/"PyYAML>=4.2b2"/"PyYAML>=3.12"/' -i optional_plugins/varianter_yaml_to_mux/setup.py %endif +%if 0%{?fedora} >= 42 +sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/html/setup.py +sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/ansible/setup.py +%endif %build %py3_build @@ -125,6 +135,14 @@ popd pushd optional_plugins/result_upload %py3_build popd +pushd optional_plugins/mail + %py3_build +popd +%if ! 0%{?rhel} +pushd optional_plugins/spawner_remote + %py3_build +popd +%endif rst2man man/avocado.rst man/avocado.1 %install @@ -139,8 +157,10 @@ for exe in \ avocado-runner-tap \ avocado-runner-asset \ avocado-runner-package \ + avocado-runner-pip \ avocado-runner-podman-image \ avocado-runner-sysinfo \ + avocado-runner-vmimage \ avocado-external-runner \ avocado-software-manager do @@ -181,6 +201,14 @@ popd pushd optional_plugins/result_upload %py3_install popd +pushd optional_plugins/mail + %py3_install +popd +%if ! 0%{?rhel} +pushd optional_plugins/spawner_remote + %py3_install +popd +%endif # cleanup plugin test cruft rm -rf %{buildroot}%{python3_sitelib}/tests mkdir -p %{buildroot}%{_sysconfdir}/avocado @@ -205,9 +233,10 @@ cp -r examples/tests %{buildroot}%{_docdir}/avocado/tests cp -r examples/varianter_cit %{buildroot}%{_docdir}/avocado/varianter_cit cp -r examples/varianter_pict %{buildroot}%{_docdir}/avocado/varianter_pict cp -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux +mkdir -p %{buildroot}%{_datarootdir}/avocado +mv %{buildroot}%{python3_sitelib}/avocado/schemas %{buildroot}%{_datarootdir}/avocado find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec chmod -c -x {} ';' - %if %{with tests} %check # LANG: to make the results predictable, we pin the language @@ -269,12 +298,18 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-runner-package-%{python3_version} %{_bindir}/avocado-runner-package-3 %{_bindir}/avocado-runner-package +%{_bindir}/avocado-runner-pip-%{python3_version} +%{_bindir}/avocado-runner-pip-3 +%{_bindir}/avocado-runner-pip %{_bindir}/avocado-runner-podman-image-%{python3_version} %{_bindir}/avocado-runner-podman-image-3 %{_bindir}/avocado-runner-podman-image %{_bindir}/avocado-runner-sysinfo-%{python3_version} %{_bindir}/avocado-runner-sysinfo-3 %{_bindir}/avocado-runner-sysinfo +%{_bindir}/avocado-runner-vmimage-%{python3_version} +%{_bindir}/avocado-runner-vmimage-3 +%{_bindir}/avocado-runner-vmimage %{_bindir}/avocado-software-manager-%{python3_version} %{_bindir}/avocado-software-manager-3 %{_bindir}/avocado-software-manager @@ -301,6 +336,10 @@ Common files (such as configuration) for the Avocado Testing Framework. %dir %{_sysconfdir}/avocado/scripts/job %dir %{_sysconfdir}/avocado/scripts/job/pre.d %dir %{_sysconfdir}/avocado/scripts/job/post.d +%dir %{_sharedstatedir}/avocado/data +%dir %{_datarootdir}/avocado +%dir %{_datarootdir}/avocado/schemas +%{_datarootdir}/avocado/schemas/* %config(noreplace) %{_sysconfdir}/avocado/sysinfo/commands %config(noreplace) %{_sysconfdir}/avocado/sysinfo/files %config(noreplace) %{_sysconfdir}/avocado/sysinfo/profilers @@ -430,6 +469,32 @@ a dedicated sever. %{python3_sitelib}/avocado_result_upload/ %{python3_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python3_version}.egg-info +%package -n python3-avocado-plugins-result-mail +Summary: Avocado Mail Notification for Jobs +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} + +%description -n python3-avocado-plugins-result-mail +The Mail result plugin enables you to receive email notifications +for job start and completion events within the Avocado testing framework. + +%files -n python3-avocado-plugins-result-mail +%{python3_sitelib}/avocado_result_mail* +%{python3_sitelib}/avocado_framework_plugin_result_mail* + +%if ! 0%{?rhel} +%package -n python3-avocado-plugins-spawner-remote +Summary: Avocado Plugin to spawn tests on a remote host +License: GPLv2+ +Requires: python3-avocado == %{version}-%{release} + +%description -n python3-avocado-plugins-spawner-remote +This optional plugin is intended to spawn tests on a remote host. + +%files -n python3-avocado-plugins-spawner-remote +%{python3_sitelib}/avocado_spawner_remote* +%{python3_sitelib}/avocado_framework_plugin_spawner_remote* +%endif %package -n python-avocado-examples Summary: Avocado Test Framework Example Tests @@ -473,6 +538,19 @@ Again Shell code (and possibly other similar shells). %changelog +* Fri Oct 10 2025 Cleber Rosa - 112.0-1 +- Sync with upstream release 112.0 +- Removed python3-elementpath build requirement +- Made the remote spawner a proper sub package +- Packaged JSON schema files +- Introduced new sub package for mail plugin +- Removed the pinning of markupsafe on Fedora 42 and later +- Packaged avocado-runner-pip +- Packaged avocado-runner-vmimage +- Provide requirements for running the functional test + nrunner.py:TaskRunStatusService.test_task_status_service_lost +- Require gcc, gdb and gdb-gdbserver for tests + * Mon Jul 17 2023 Cleber Rosa - 102.0-1 - Sync with upstream release 102.0 - Added new avocado-runner-podman-image script diff --git a/sources b/sources index df8cd21..6494afc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-102.0.tar.gz) = 8c772fd4bef31ed04072e52a88a1d3af7bd28021573d138beacac270774e89b801f8430e80e46453a6c8dc51fe4472310d294271a1e801fbb31dc1dae2b7b1c3 +SHA512 (avocado-112.0.tar.gz) = 1872eda730f5cd28f0562732464ce14b2c7731cedb298fcc4b093a04235d26cc5e3db7f92c3ae3edcd6104ad2db4fce66fa7a6148da754e4bdb8120fa12a75a3 From 60ceb66d1436bd8329fd57b223811243bdf725b6 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Fri, 7 Nov 2025 16:18:39 -0500 Subject: [PATCH 17/17] Update license format to match SPDX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested-by: Miroslav Suchý Signed-off-by: Cleber Rosa --- python-avocado.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index 62fe7d9..f55cf9a 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -37,7 +37,7 @@ Name: python-avocado Version: 112.0 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: # avocado/core/tapparser.py: MIT @@ -47,7 +47,7 @@ Summary: Framework with tools and libraries for Automated Testing # optional_plugins/html/avocado_result_html/templates/bootstrap.min.js: MIT # selftests/.data/jenkins-junit.xsd: MIT # Other files: GPLv2 and GPLv2+ -License: GPLv2+ and GPLv2 and MIT +License: GPL-2.0-or-later AND GPL-2.0-only AND MIT URL: https://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/avocado/archive/%{gitref}/%{gittar} BuildArch: noarch @@ -349,7 +349,7 @@ Common files (such as configuration) for the Avocado Testing Framework. %package -n python3-avocado-plugins-output-html Summary: Avocado HTML report plugin -License: GPLv2+ and MIT +License: GPL-2.0-or-later AND MIT Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-output-html @@ -365,7 +365,7 @@ arbitrary filesystem location. %if %{with_resultsdb} %package -n python3-avocado-plugins-resultsdb Summary: Avocado plugin to propagate job results to ResultsDB -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-resultsdb @@ -381,7 +381,7 @@ server. %package -n python3-avocado-plugins-varianter-yaml-to-mux Summary: Avocado plugin to generate variants out of yaml files -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-varianter-yaml-to-mux @@ -395,7 +395,7 @@ defined in a yaml file(s). %package -n python3-avocado-plugins-golang Summary: Avocado plugin for execution of golang tests -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} Requires: golang @@ -412,7 +412,7 @@ also run them. %if ! 0%{?rhel} %package -n python3-avocado-plugins-ansible Summary: Avocado Ansible Dependency plugin -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} Requires: ansible-core @@ -429,7 +429,7 @@ tests. %package -n python3-avocado-plugins-varianter-pict Summary: Varianter with combinatorial capabilities by PICT -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-varianter-pict @@ -443,7 +443,7 @@ Pair-Wise algorithms, also known as Combinatorial Independent Testing. %package -n python3-avocado-plugins-varianter-cit Summary: Varianter with Combinatorial Independent Testing capabilities -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-varianter-cit @@ -458,7 +458,7 @@ collaboration with CVUT Prague. %package -n python3-avocado-plugins-result-upload Summary: Avocado plugin propagate job results to a remote host -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-result-upload @@ -471,7 +471,7 @@ a dedicated sever. %package -n python3-avocado-plugins-result-mail Summary: Avocado Mail Notification for Jobs -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-result-mail @@ -485,7 +485,7 @@ for job start and completion events within the Avocado testing framework. %if ! 0%{?rhel} %package -n python3-avocado-plugins-spawner-remote Summary: Avocado Plugin to spawn tests on a remote host -License: GPLv2+ +License: GPL-2.0-or-later Requires: python3-avocado == %{version}-%{release} %description -n python3-avocado-plugins-spawner-remote @@ -498,7 +498,7 @@ This optional plugin is intended to spawn tests on a remote host. %package -n python-avocado-examples Summary: Avocado Test Framework Example Tests -License: GPLv2+ +License: GPL-2.0-or-later # documentation does not require main package, but needs to be in lock-step if present Conflicts: python3-avocado < %{version}-%{release}, python3-avocado > %{version}-%{release} @@ -520,7 +520,7 @@ examples of how to write tests on your own. %package -n python-avocado-bash Summary: Avocado Test Framework Bash Utilities -License: GPLv2+ and GPLv2 +License: GPL-2.0-or-later AND GPLv-2.0-only Requires: python-avocado-common == %{version}-%{release} %description -n python-avocado-bash @@ -538,6 +538,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Fri Nov 07 2025 Cleber Rosa - 112.0-2 +- Update license format to match The System Package Data Exchange (SPDX) + * Fri Oct 10 2025 Cleber Rosa - 112.0-1 - Sync with upstream release 112.0 - Removed python3-elementpath build requirement