From f0e9dccf5c9d4844fd2fccac197031233e0c3a8a Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Aug 28 2018 18:37:22 +0000 Subject: Sync with upstream release 64.0. Signed-off-by: Merlin Mathesius --- diff --git a/.gitignore b/.gitignore index 228f24c..029e842 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /avocado-61.0.tar.gz /avocado-62.0.tar.gz /avocado-63.0.tar.gz +/avocado-64.0.tar.gz diff --git a/avocado-63.0-pep479.patch b/avocado-63.0-pep479.patch deleted file mode 100644 index ae74267..0000000 --- a/avocado-63.0-pep479.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 023e3186f6577d3292941c4634ca04effef1e713 Mon Sep 17 00:00:00 2001 -From: Cleber Rosa -Date: Fri, 20 Jul 2018 14:41:54 -0400 -Subject: [PATCH] PEP479: do not raise StopIteration - -Raising StopIteration gets translated to a RuntimeError in Python 3.7. -The same behavior can be achieved by 'return' from generators. - -Reference: https://github.com/avocado-framework/avocado/issues/2721 -Signed-off-by: Cleber Rosa ---- - avocado/core/tree.py | 2 +- - .../varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/mux.py | 8 +++++--- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/avocado/core/tree.py b/avocado/core/tree.py -index 36b6629f8..2406b39a7 100644 ---- a/avocado/core/tree.py -+++ b/avocado/core/tree.py -@@ -274,7 +274,7 @@ def iter_parents(self): - node = self.parent - while True: - if node is None: -- raise StopIteration -+ return - yield node - node = node.parent - -diff --git a/optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/mux.py b/optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/mux.py -index a7e6272cb..d6a6cf28e 100644 ---- a/optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/mux.py -+++ b/optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/mux.py -@@ -73,7 +73,7 @@ def _iter_mux_leaves(node): - try: - node = queue.popleft() - except IndexError: -- raise StopIteration -+ return - - def __iter__(self): - """ -@@ -101,7 +101,10 @@ def iter_variants(self): - pools.append([pool]) - variants = itertools.product(*pools) - while True: -- yield list(itertools.chain(*next(variants))) -+ try: -+ yield list(itertools.chain(*next(variants))) -+ except StopIteration: -+ return - - @staticmethod - def _valid_variant(variant): -@@ -310,7 +313,6 @@ def iteritems(self): - """ Slower implementation with the use of __getitem__ """ - for key in iterkeys(self): - yield key, self[key] -- raise StopIteration - - - class Control(object): # Few methods pylint: disable=R0903 diff --git a/avocado-63.0-selftest-python-version-2.patch b/avocado-63.0-selftest-python-version-2.patch deleted file mode 100644 index c5f8325..0000000 --- a/avocado-63.0-selftest-python-version-2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b2db940621dd8fa75b38db54a704be7a9ab0062 Mon Sep 17 00:00:00 2001 -From: Cleber Rosa -Date: Fri, 20 Jul 2018 17:30:57 -0400 -Subject: [PATCH] selftests/functional/test_basic.py: prevent unversioned - Python - -`examples/tests/simplewarning.sh` calls a generic avocado command, -which gets added to the path by the test code. That generic avocado -command is `scripts/avocado`, from the source repository, which -contains the unversioned `/usr/bin/env python`. - -Under some environments, such as Fedora >= 29, there may be no -unversioned Python binary. Let's respect the UNITTEST_AVOCADO_CMD -environment variable, and add the the directory containting that -binary to the PATH. - -Signed-off-by: Cleber Rosa ---- - selftests/functional/test_basic.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/selftests/functional/test_basic.py b/selftests/functional/test_basic.py -index 7b7edbada..1f26f9db2 100644 ---- a/selftests/functional/test_basic.py -+++ b/selftests/functional/test_basic.py -@@ -730,7 +730,9 @@ def test_simplewarning(self): - simplewarning.sh uses the avocado-bash-utils - """ - # simplewarning.sh calls "avocado" without specifying a path -- os.environ['PATH'] += ":" + os.path.join(basedir, 'scripts') -+ # let's add the path that was defined at the global module -+ # scope here -+ os.environ['PATH'] += ":" + os.path.dirname(AVOCADO) - # simplewarning.sh calls "avocado exec-path" which hasn't - # access to an installed location for the libexec scripts - os.environ['PATH'] += ":" + os.path.join(basedir, 'libexec') diff --git a/avocado-63.0-selftest-python-version.patch b/avocado-63.0-selftest-python-version.patch deleted file mode 100644 index 185acf9..0000000 --- a/avocado-63.0-selftest-python-version.patch +++ /dev/null @@ -1,77 +0,0 @@ -From d86a844a5fb92d9de6f224a7c44903ffb5cba5ca Mon Sep 17 00:00:00 2001 -From: Merlin Mathesius -Date: Tue, 17 Jul 2018 16:55:34 -0500 -Subject: [PATCH] Fix scripts to explicitly use proper version of Python. - -Signed-off-by: Merlin Mathesius ---- - selftests/functional/test_skiptests.py | 4 ++-- - selftests/functional/test_utils.py | 8 ++++---- - selftests/run | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/selftests/functional/test_skiptests.py b/selftests/functional/test_skiptests.py -index f82ad610e..70ecdc10a 100644 ---- a/selftests/functional/test_skiptests.py -+++ b/selftests/functional/test_skiptests.py -@@ -127,7 +127,7 @@ def test_skip_decorators(self): - - def test_skip_setup(self): - os.chdir(basedir) -- cmd_line = ['./scripts/avocado', -+ cmd_line = [AVOCADO, - 'run', - '--sysinfo=off', - '--job-results-dir', -@@ -141,7 +141,7 @@ def test_skip_setup(self): - - def test_skip_teardown(self): - os.chdir(basedir) -- cmd_line = ['./scripts/avocado', -+ cmd_line = [AVOCADO, - 'run', - '--sysinfo=off', - '--job-results-dir', -diff --git a/selftests/functional/test_utils.py b/selftests/functional/test_utils.py -index 33fbd5334..8b74a546f 100644 ---- a/selftests/functional/test_utils.py -+++ b/selftests/functional/test_utils.py -@@ -20,7 +20,7 @@ - stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP | - stat.S_IROTH | stat.S_IXOTH) - --FAKE_VMSTAT_CONTENTS = """#!/usr/bin/env python -+FAKE_VMSTAT_CONTENTS = """#!{python} - import time - import random - import signal -@@ -115,13 +115,13 @@ def start(self): - if __name__ == '__main__': - vmstat = FakeVMStat(interval=float(sys.argv[1])) - vmstat.start() --""" -+""".format(python=sys.executable) - --FAKE_UPTIME_CONTENTS = """#!/usr/bin/env python -+FAKE_UPTIME_CONTENTS = """#!{python} - if __name__ == '__main__': - print("17:56:34 up 8:06, 7 users, load average: 0.26, 0.20, 0.21") - --""" -+""".format(python=sys.executable) - - - class ProcessTest(unittest.TestCase): -diff --git a/selftests/run b/selftests/run -index 0a165ccb4..bd2639446 100755 ---- a/selftests/run -+++ b/selftests/run -@@ -59,7 +59,7 @@ class MyResult(unittest.TextTestResult): - stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate() - # ... and check whether some dirs were left behind -- dir_check = subprocess.Popen([CHECK_TMP_DIRS], stdout=subprocess.PIPE, -+ dir_check = subprocess.Popen([sys.executable, CHECK_TMP_DIRS], stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - if dir_check.wait(): - raise AssertionError("Test %s left some tmp files behind:\n%s" diff --git a/python-avocado.spec b/python-avocado.spec index ba6cc08..3670db8 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 ac8d94ee762f4e8ff71a5cae1ddf3019f46b0595 + %global commit d969799cd6d9705133f09f85be4d5687ac85154e %endif %if ! 0%{?commit_date:1} - %global commit_date 20180717 + %global commit_date 20180827 %endif %global shortcommit %(c=%{commit};echo ${c:0:8}) %global gitrel .%{commit_date}git%{shortcommit} @@ -41,9 +41,16 @@ %bcond_with python3 %endif +# Python 3 version of Fabric package is new starting with Fedora 29 +%if %{with python3} && 0%{?fedora} >= 29 +%global with_python3_fabric 1 +%else +%global with_python3_fabric 0 +%endif + Name: python-%{pkgname} -Version: 63.0 -Release: 2%{?gitrel}%{?dist} +Version: 64.0 +Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -53,15 +60,6 @@ Group: Development/Tools License: GPLv2 and MIT URL: http://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar} -# Fix scripts to explicitly use proper version of Python -# From upstream commit d86a844a5fb92d9de6f224a7c44903ffb5cba5ca -Patch0: avocado-63.0-selftest-python-version.patch -# PEP479: do not raise StopIteration -# From upstream commit 023e3186f6577d3292941c4634ca04effef1e713 -Patch1: avocado-63.0-pep479.patch -# Fix scripts to avoid using unversioned Python -# From upstream commit 9b2db940621dd8fa75b38db54a704be7a9ab0062 -Patch2: avocado-63.0-selftest-python-version-2.patch BuildArch: noarch BuildRequires: procps-ng @@ -91,6 +89,7 @@ BuildRequires: fabric %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python2-enum34 BuildRequires: python2-lxml +BuildRequires: python2-pycdlib BuildRequires: python2-stevedore %else BuildRequires: python-enum34 @@ -106,12 +105,17 @@ BuildRequires: python3-docutils BuildRequires: python3-lxml BuildRequires: python3-mock BuildRequires: python3-psutil +BuildRequires: python3-pycdlib BuildRequires: python3-pystache BuildRequires: python3-requests +BuildRequires: python3-resultsdb_api BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: python3-sphinx BuildRequires: python3-stevedore +%if %{with_python3_fabric} +BuildRequires: python3-fabric3 +%endif %endif %if 0%{?with_tests} @@ -141,9 +145,6 @@ these days a framework) to perform automated testing. %prep %setup -q -n %{srcname}-%{gitref} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 # package plugins-runner-vm requires libvirt-python, but the RPM # version of libvirt-python does not publish the egg info and this # causes that dep to be attempted to be installed by pip @@ -169,24 +170,24 @@ pushd optional_plugins/runner_remote %if %{with python2} %py2_build %endif - %if %{with python3} - # no runner_remote plugin on Python 3 due to missing Fabric package + %if %{with_python3_fabric} + %py3_build %endif popd pushd optional_plugins/runner_vm %if %{with python2} %py2_build %endif - %if %{with python3} - # no runner_vm plugin on Python 3 due to missing Fabric package + %if %{with_python3_fabric} + %py3_build %endif popd pushd optional_plugins/runner_docker %if %{with python2} %py2_build %endif - %if %{with python3} - # no runner_docker plugin on Python 3 due to missing Fabric package + %if %{with_python3_fabric} + %py3_build %endif popd pushd optional_plugins/resultsdb @@ -194,7 +195,7 @@ pushd optional_plugins/resultsdb %py2_build %endif %if %{with python3} - # no resultsdb plugin on Python 3 due to missing resultsdb_api package + %py3_build %endif popd pushd optional_plugins/varianter_yaml_to_mux @@ -229,6 +230,14 @@ pushd optional_plugins/varianter_pict %py3_build %endif popd +pushd optional_plugins/varianter_cit + %if %{with python2} + %py2_build + %endif + %if %{with python3} + %py3_build + %endif +popd pushd optional_plugins/result_upload %if %{with python2} %py2_build @@ -292,24 +301,24 @@ pushd optional_plugins/runner_remote %if %{with python2} %py2_install %endif - %if %{with python3} - # no runner_remote plugin on Python 3 due to missing Fabric package + %if %{with_python3_fabric} + %py3_install %endif popd pushd optional_plugins/runner_vm %if %{with python2} %py2_install %endif - %if %{with python3} - # no runner_vm plugin on Python 3 due to missing Fabric package + %if %{with_python3_fabric} + %py3_install %endif popd pushd optional_plugins/runner_docker %if %{with python2} %py2_install %endif - %if %{with python3} - # no runner_docker plugin on Python 3 due to missing Fabric package + %if %{with_python3_fabric} + %py3_install %endif popd pushd optional_plugins/resultsdb @@ -317,7 +326,7 @@ pushd optional_plugins/resultsdb %py2_install %endif %if %{with python3} - # no resultsdb plugin on Python 3 due to missing resultsdb_api package + %py3_install %endif popd pushd optional_plugins/varianter_yaml_to_mux @@ -352,6 +361,14 @@ pushd optional_plugins/varianter_pict %py3_install %endif popd +pushd optional_plugins/varianter_cit + %if %{with python2} + %py2_install + %endif + %if %{with python3} + %py3_install + %endif +popd pushd optional_plugins/result_upload %if %{with python2} %py2_install @@ -395,6 +412,7 @@ popd %{__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 @@ -433,6 +451,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x pushd optional_plugins/varianter_pict %{__python2} setup.py develop --user popd + pushd optional_plugins/varianter_cit + %{__python2} setup.py develop --user + popd pushd optional_plugins/result_upload %{__python2} setup.py develop --user popd @@ -442,13 +463,14 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x # 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 + # amount of resources we have observed so far. Let's avoid tests that # require too much resources or are time sensitive # UNITTEST_AVOCADO_CMD: the "avocado" command to be run during - # unittests needs to be a Python specific one on Fedora >= 28. Let's + # unittests needs to be a Python specific one on Fedora >= 28. Let's # use the one that was setup in the source tree by the "setup.py # develop --user" step and is guaranteed to be version specific. - LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$HOME/.local/bin/avocado %{__python2} selftests/run + USER_BASE=`%{__python2} -m site --user-base` + LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$USER_BASE/bin/avocado %{__python2} selftests/run %endif %if %{with python3} @@ -456,17 +478,19 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x pushd optional_plugins/html %{__python3} setup.py develop --user popd + %if %{with_python3_fabric} pushd optional_plugins/runner_remote - # no runner_remote plugin on Python 3 due to missing Fabric package + %{__python3} setup.py develop --user popd pushd optional_plugins/runner_vm - # no runner_vm plugin on Python 3 due to missing Fabric package + %{__python3} setup.py develop --user popd pushd optional_plugins/runner_docker - # no runner_docker plugin on Python 3 due to missing Fabric package + %{__python3} setup.py develop --user popd + %endif pushd optional_plugins/resultsdb - # no resultsdb plugin on Python 3 due to missing resultsdb_api package + %{__python3} setup.py develop --user popd pushd optional_plugins/varianter_yaml_to_mux %{__python3} setup.py develop --user @@ -480,13 +504,17 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x 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 pushd optional_plugins/glib %{__python3} setup.py develop --user popd - LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$HOME/.local/bin/avocado %{__python3} selftests/run + USER_BASE=`%{__python3} -m site --user-base` + LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$USER_BASE/bin/avocado %{__python3} selftests/run %endif %endif @@ -507,6 +535,7 @@ Requires: python2-setuptools Requires: python2-six %if 0%{?fedora} || 0%{?rhel} > 7 Requires: python2-enum34 +Requires: python2-pycdlib Requires: python2-stevedore %else Requires: python-enum34 @@ -541,6 +570,7 @@ Requires: gdb-gdbserver Requires: procps-ng Requires: pyliblzma Requires: python3 +Requires: python3-pycdlib Requires: python3-requests Requires: python3-setuptools Requires: python3-six @@ -654,9 +684,20 @@ connection. Avocado must be previously installed on the remote machine. %{python2_sitelib}/avocado_framework_plugin_runner_remote-%{version}-py%{python2_version}.egg-info %endif -%if %{with python3} -# no python3-%%{pkgname}-plugins-runner-remote package due to -# no runner_remote plugin on Python 3 due to missing Fabric package +%if %{with_python3_fabric} +%package -n python3-%{pkgname}-plugins-runner-remote +Summary: Avocado Runner for Remote Execution +%{?python_provide:%python_provide python3-%{pkgname}-plugins-runner-remote} +Requires: python3-%{pkgname} == %{version}-%{release} +Requires: python3-fabric3 + +%description -n python3-%{pkgname}-plugins-runner-remote +Allows Avocado to run jobs on a remote machine, by means of an SSH +connection. Avocado must be previously installed on the remote machine. + +%files -n python3-%{pkgname}-plugins-runner-remote +%{python3_sitelib}/avocado_runner_remote/ +%{python3_sitelib}/avocado_framework_plugin_runner_remote-%{version}-py%{python3_version}.egg-info %endif @@ -682,9 +723,22 @@ itself. Avocado must be previously installed on the VM. %{python2_sitelib}/avocado_framework_plugin_runner_vm-%{version}-py%{python2_version}.egg-info %endif -%if %{with python3} -# no python3-%%{pkgname}-plugins-runner-vm package due to -# no runner_vm plugin on Python 3 due to missing Fabric package +%if %{with_python3_fabric} +%package -n python3-%{pkgname}-plugins-runner-vm +Summary: Avocado Runner for libvirt VM Execution +%{?python_provide:%python_provide python3-%{pkgname}-plugins-runner-vm} +Requires: python3-%{pkgname} == %{version}-%{release} +Requires: python3-%{pkgname}-plugins-runner-remote == %{version}-%{release} +Requires: python3-libvirt + +%description -n python3-%{pkgname}-plugins-runner-vm +Allows Avocado to run jobs on a libvirt based VM, by means of +interaction with a libvirt daemon and an SSH connection to the VM +itself. Avocado must be previously installed on the VM. + +%files -n python3-%{pkgname}-plugins-runner-vm +%{python3_sitelib}/avocado_runner_vm/ +%{python3_sitelib}/avocado_framework_plugin_runner_vm-%{version}-py%{python3_version}.egg-info %endif @@ -706,9 +760,22 @@ be previously installed on the container. %{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info %endif -%if %{with python3} -# no python3-%%{pkgname}-plugins-runner-docker package due to -# no runner_docker plugin on Python 3 due to missing Fabric package +%if %{with_python3_fabric} +%package -n python3-%{pkgname}-plugins-runner-docker +Summary: Avocado Runner for Execution on Docker Containers +%{?python_provide:%python_provide python3-%{pkgname}-plugins-runner-docker} +Requires: python3-%{pkgname} == %{version}-%{release} +Requires: python3-%{pkgname}-plugins-runner-remote == %{version}-%{release} +Requires: python3-aexpect + +%description -n python3-%{pkgname}-plugins-runner-docker +Allows Avocado to run jobs on a Docker container by interacting with a +Docker daemon and attaching to the container itself. Avocado must +be previously installed on the container. + +%files -n python3-%{pkgname}-plugins-runner-docker +%{python3_sitelib}/avocado_runner_docker/ +%{python3_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python3_version}.egg-info %endif @@ -730,8 +797,20 @@ server. %endif %if %{with python3} -# no python3-%%{pkgname}-plugins-resultsdb package due to -# no resultsdb plugin on Python 3 due to missing resultsdb_api package +%package -n python3-%{pkgname}-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 + +%description -n python3-%{pkgname}-plugins-resultsdb +Allows Avocado to send job results directly to a ResultsDB +server. + +%files -n python3-%{pkgname}-plugins-resultsdb +%{python3_sitelib}/avocado_resultsdb/ +%{python3_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python3_version}.egg-info +%config(noreplace) %{_sysconfdir}/avocado/conf.d/resultsdb.conf %endif @@ -834,7 +913,7 @@ also run them. %if %{with python2} %package -n python2-%{pkgname}-plugins-varianter-pict -Summary: Avocado plugin to generate variants with combinatorial capabilities by PICT +Summary: Varianter with combinatorial capabilities by PICT %{?python_provide:%python_provide python2-%{pkgname}-plugins-varianter-pict} Requires: python2-%{pkgname} == %{version}-%{release} @@ -849,7 +928,7 @@ Pair-Wise algorithms, also known as Combinatorial Independent Testing. %if %{with python3} %package -n python3-%{pkgname}-plugins-varianter-pict -Summary: Avocado plugin to generate variants with combinatorial capabilities by PICT +Summary: Varianter with combinatorial capabilities by PICT %{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-pict} Requires: python3-%{pkgname} == %{version}-%{release} @@ -864,6 +943,39 @@ Pair-Wise algorithms, also known as Combinatorial Independent Testing. %if %{with python2} +%package -n python2-%{pkgname}-plugins-varianter-cit +Summary: Varianter with Combinatorial Independent Testing capabilities +%{?python_provide:%python_provide python2-%{pkgname}-plugins-varianter-cit} +Requires: python2-%{pkgname} == %{version}-%{release} + +%description -n python2-%{pkgname}-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 python2-%{pkgname}-plugins-varianter-cit +%{python2_sitelib}/avocado_varianter_cit/ +%{python2_sitelib}/avocado_framework_plugin_varianter_cit-%{version}-py%{python2_version}.egg-info +%endif + +%if %{with python3} +%package -n python3-%{pkgname}-plugins-varianter-cit +Summary: Varianter with Combinatorial Independent Testing capabilities +%{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-cit} +Requires: python3-%{pkgname} == %{version}-%{release} + +%description -n python3-%{pkgname}-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 +%{python3_sitelib}/avocado_varianter_cit/ +%{python3_sitelib}/avocado_framework_plugin_varianter_cit-%{version}-py%{python3_version}.egg-info +%endif + + +%if %{with python2} %package -n python2-%{pkgname}-plugins-result-upload Summary: Avocado plugin propagate job results to a remote host %{?python_provide:%python_provide python2-%{pkgname}-plugins-result-upload} @@ -943,6 +1055,7 @@ examples of how to write tests on your own. %{_docdir}/avocado/gdb-prerun-scripts %{_docdir}/avocado/plugins %{_docdir}/avocado/tests +%{_docdir}/avocado/varianter_cit %{_docdir}/avocado/varianter_pict %{_docdir}/avocado/wrappers %{_docdir}/avocado/yaml_to_mux @@ -967,6 +1080,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Aug 28 2018 Merlin Mathesius - 64.0-1 +- Sync with upstream release 64.0. + * Thu Jul 26 2018 Merlin Mathesius - 63.0-2 - Added missing python[2]-enum34 requirement. diff --git a/sources b/sources index e4bc5b1..6947419 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-63.0.tar.gz) = 747f7192aff3ddb2682a46cabcfe710840d54f561168110c28da4a89f44cb7d64f8395c7d0ed652a65705e09629a8aac0a2e125c183c6422625f32481fa127bb +SHA512 (avocado-64.0.tar.gz) = 853d5eca023190ad00be91a973d14d7ad445f9ba10080681ba8a08d4ec7fdfcfcaa9dbf5181696858d619f3adb8185de00c514edbae1dea21a70ed99e7d3d612