Hello community, here is the log from the commit of package python-pytest-bdd for openSUSE:Factory checked in at 2020-03-10 11:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-bdd (Old) and /work/SRC/openSUSE:Factory/.python-pytest-bdd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-bdd" Tue Mar 10 11:11:34 2020 rev:4 rq:783248 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-bdd/python-pytest-bdd.changes 2019-09-10 00:04:03.257205193 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytest-bdd.new.26092/python-pytest-bdd.changes 2020-03-10 11:11:35.282520235 +0100 @@ -1,0 +2,6 @@ +Tue Mar 10 09:40:32 UTC 2020 - Ondřej Súkup <[email protected]> + +- use %pytest macro +- add test_flaky.patch to fix gerkhin reporter test flakinness + +------------------------------------------------------------------- New: ---- test_flaky.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-bdd.spec ++++++ --- /var/tmp/diff_new_pack.T7WL3n/_old 2020-03-10 11:11:36.834521049 +0100 +++ /var/tmp/diff_new_pack.T7WL3n/_new 2020-03-10 11:11:36.838521051 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pytest-bdd # -# 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,6 +25,7 @@ Group: Development/Languages/Python URL: https://github.com/pytest-dev/pytest-bdd Source: https://github.com/pytest-dev/pytest-bdd/archive/%{version}.tar.gz#/pytest-bdd-%{version}.tar.gz +Patch0: test_flaky.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -74,6 +75,7 @@ %prep %setup -q -n pytest-bdd-%{version} +%patch0 -p1 sed -i '/tox/d' setup.py %build @@ -86,7 +88,7 @@ %check export LANG=en_US.UTF-8 -%python_exec setup.py pytest +%pytest %post %python_install_alternative pytest-bdd ++++++ test_flaky.patch ++++++ >From 3f1ba96c2de855f96bda04cff8250f8c5a6095ed Mon Sep 17 00:00:00 2001 From: Florian Bruhin <[email protected]> Date: Wed, 20 Nov 2019 22:19:18 +0100 Subject: [PATCH] Fix gherkin terminal reporter test flakiness (#340) The test compares the output of two different reporters and tries to account for the different runtime being printed. However, the output format changed with pytest v5.1.0: https://docs.pytest.org/en/latest/changelog.html#id76 This changes the regex to be a bit more permissive. --- tests/feature/test_gherkin_terminal_reporter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pytest-bdd-3.2.1/tests/feature/test_gherkin_terminal_reporter.py =================================================================== --- pytest-bdd-3.2.1.orig/tests/feature/test_gherkin_terminal_reporter.py +++ pytest-bdd-3.2.1/tests/feature/test_gherkin_terminal_reporter.py @@ -166,9 +166,9 @@ def output_must_be_the_same_as_regular_r assert ghe.ret == 0 # last line can be different because of test execution time is printed reg_lines = reg.stdout.lines if reg.stdout.lines[-1] else reg.stdout.lines[:-2] - reg_lines[-1] = re.sub(r' \d+\.\d+ ', ' X ', reg_lines[-1]) + reg_lines[-1] = re.sub(r" in [^=]*", " in X ", reg_lines[-1]) ghe_lines = ghe.stdout.lines if ghe.stdout.lines[-1] else ghe.stdout.lines[:-2] - ghe_lines[-1] = re.sub(r' \d+\.\d+ ', ' X ', ghe_lines[-1]) + ghe_lines[-1] = re.sub(r" in [^=]*", " in X ", ghe_lines[-1]) for l1, l2 in zip(reg_lines, ghe_lines): assert l1 == l2
