Hello community, here is the log from the commit of package python-flaky for openSUSE:Factory checked in at 2020-08-01 12:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-flaky (Old) and /work/SRC/openSUSE:Factory/.python-flaky.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-flaky" Sat Aug 1 12:31:14 2020 rev:7 rq:823295 version:3.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-flaky/python-flaky.changes 2020-02-03 11:12:29.445819836 +0100 +++ /work/SRC/openSUSE:Factory/.python-flaky.new.3592/python-flaky.changes 2020-08-01 12:31:31.838476618 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 05:39:42 UTC 2020 - Steve Kowalik <steven.kowalik@suse.com> + +- Update to 3.7.0: + * Flaky now retries tests which fail during setup. + +------------------------------------------------------------------- Old: ---- flaky-3.6.1.tar.gz New: ---- flaky-3.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-flaky.spec ++++++ --- /var/tmp/diff_new_pack.F8GGol/_old 2020-08-01 12:31:36.146480652 +0200 +++ /var/tmp/diff_new_pack.F8GGol/_new 2020-08-01 12:31:36.150480656 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-flaky +# spec file for package python # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,11 +25,10 @@ %bcond_with test %endif Name: python-flaky%{?psuffix} -Version: 3.6.1 +Version: 3.7.0 Release: 0 Summary: Plugin for nose or py.test that automatically reruns flaky tests License: Apache-2.0 -Group: Development/Languages/Python URL: https://github.com/box/flaky Source: https://files.pythonhosted.org/packages/source/f/flaky/flaky-%{version}.tar.gz BuildRequires: %{python_module setuptools} ++++++ flaky-3.6.1.tar.gz -> flaky-3.7.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flaky-3.6.1/PKG-INFO new/flaky-3.7.0/PKG-INFO --- old/flaky-3.6.1/PKG-INFO 2019-08-06 20:41:21.000000000 +0200 +++ new/flaky-3.7.0/PKG-INFO 2020-07-08 23:31:59.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: flaky -Version: 3.6.1 +Version: 3.7.0 Summary: Plugin for nose or pytest that automatically reruns flaky tests. Home-page: https://github.com/box/flaky Author: Box @@ -9,7 +9,7 @@ Description: flaky ===== - .. image:: http://opensource.box.com/badges/active.svg + .. image:: http://opensource.box.com/badges/stable.svg :target: http://opensource.box.com/badges .. image:: https://travis-ci.org/box/flaky.svg?branch=master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flaky-3.6.1/README.rst new/flaky-3.7.0/README.rst --- old/flaky-3.6.1/README.rst 2019-06-24 19:05:14.000000000 +0200 +++ new/flaky-3.7.0/README.rst 2020-07-08 23:28:17.000000000 +0200 @@ -1,7 +1,7 @@ flaky ===== -.. image:: http://opensource.box.com/badges/active.svg +.. image:: http://opensource.box.com/badges/stable.svg :target: http://opensource.box.com/badges .. image:: https://travis-ci.org/box/flaky.svg?branch=master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flaky-3.6.1/flaky/flaky_pytest_plugin.py new/flaky-3.7.0/flaky/flaky_pytest_plugin.py --- old/flaky-3.6.1/flaky/flaky_pytest_plugin.py 2019-08-06 20:25:51.000000000 +0200 +++ new/flaky-3.7.0/flaky/flaky_pytest_plugin.py 2020-07-08 04:15:30.000000000 +0200 @@ -46,7 +46,9 @@ min_passes = None config = None _call_infos = {} + _PYTEST_WHEN_SETUP = 'setup' _PYTEST_WHEN_CALL = 'call' + _PYTEST_WHENS = (_PYTEST_WHEN_SETUP, _PYTEST_WHEN_CALL) _PYTEST_OUTCOME_PASSED = 'passed' _PYTEST_OUTCOME_FAILED = 'failed' _PYTEST_EMPTY_STATUS = ('', '', '') @@ -90,17 +92,24 @@ self.runner.call_and_report = self.call_and_report while should_rerun: self.runner.pytest_runtest_protocol(item, nextitem) - call_info = self._call_infos.get(item, {}).get(self._PYTEST_WHEN_CALL, None) + call_info = None + excinfo = None + for when in self._PYTEST_WHENS: + call_info = self._call_infos.get(item, {}).get(when, None) + excinfo = getattr(call_info, 'excinfo', None) + if excinfo is not None: + break + if call_info is None: return False - passed = call_info.excinfo is None + passed = excinfo is None if passed: should_rerun = self.add_success(item) else: - skipped = call_info.excinfo.typename == 'Skipped' - should_rerun = not skipped and self.add_failure(item, call_info.excinfo) + skipped = excinfo.typename == 'Skipped' + should_rerun = not skipped and self.add_failure(item, excinfo) if not should_rerun: - item.excinfo = call_info.excinfo + item.excinfo = excinfo finally: self.runner.call_and_report = original_call_and_report del self._call_infos[item] @@ -132,12 +141,12 @@ report = hook.pytest_runtest_makereport(item=item, call=call) # Start flaky modifications # only retry on call, not setup or teardown - if report.when == self._PYTEST_WHEN_CALL: + if report.when in self._PYTEST_WHENS: if report.outcome == self._PYTEST_OUTCOME_PASSED: if self._should_handle_test_success(item): log = False elif report.outcome == self._PYTEST_OUTCOME_FAILED: - err, name = self._get_test_name_and_err(item) + err, name = self._get_test_name_and_err(item, when) if self._will_handle_test_error_or_failure(item, name, err): log = False # End flaky modifications @@ -147,7 +156,7 @@ hook.pytest_exception_interact(node=item, call=call, report=report) return report - def _get_test_name_and_err(self, item): + def _get_test_name_and_err(self, item, when): """ Get the test name and error tuple from a test item. @@ -161,7 +170,7 @@ ((`type`, :class:`Exception`, :class:`Traceback`) or (None, None, None), `unicode`) """ name = self._get_test_callable_name(item) - call_info = self._call_infos.get(item, {}).get(self._PYTEST_WHEN_CALL, None) + call_info = self._call_infos.get(item, {}).get(when, None) if call_info is not None and call_info.excinfo: err = (call_info.excinfo.type, call_info.excinfo.value, call_info.excinfo.tb) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flaky-3.6.1/flaky.egg-info/PKG-INFO new/flaky-3.7.0/flaky.egg-info/PKG-INFO --- old/flaky-3.6.1/flaky.egg-info/PKG-INFO 2019-08-06 20:41:21.000000000 +0200 +++ new/flaky-3.7.0/flaky.egg-info/PKG-INFO 2020-07-08 23:31:59.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: flaky -Version: 3.6.1 +Version: 3.7.0 Summary: Plugin for nose or pytest that automatically reruns flaky tests. Home-page: https://github.com/box/flaky Author: Box @@ -9,7 +9,7 @@ Description: flaky ===== - .. image:: http://opensource.box.com/badges/active.svg + .. image:: http://opensource.box.com/badges/stable.svg :target: http://opensource.box.com/badges .. image:: https://travis-ci.org/box/flaky.svg?branch=master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flaky-3.6.1/setup.py new/flaky-3.7.0/setup.py --- old/flaky-3.6.1/setup.py 2019-08-06 20:40:34.000000000 +0200 +++ new/flaky-3.7.0/setup.py 2020-07-08 23:28:17.000000000 +0200 @@ -55,7 +55,7 @@ base_dir = dirname(__file__) setup( name='flaky', - version='3.6.1', + version='3.7.0', description='Plugin for nose or pytest that automatically reruns flaky tests.', long_description=open(join(base_dir, 'README.rst')).read(), author='Box',