From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/
Date: Sun, 23 Jan 2022 14:56:51 +0000 (UTC) [thread overview]
Message-ID: <1642949805.68ac981a6ec2ad91072cd4aba96492c680b33e7c.mgorny@gentoo> (raw)
commit: 68ac981a6ec2ad91072cd4aba96492c680b33e7c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 14:07:40 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 14:56:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ac981a
dev-python/pytest-cov: Backport test fix for coverage-6.2
Closes: https://bugs.gentoo.org/823766
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pytest-cov-3.0.0-coverage-6.2.patch | 30 ++++++++++++++++++++++
dev-python/pytest-cov/pytest-cov-3.0.0.ebuild | 7 ++++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch b/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch
new file mode 100644
index 000000000000..b44326d8b60d
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch
@@ -0,0 +1,30 @@
+From 6d06678a76d9275beb48917d7653ea6a610c7717 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 23 Jan 2022 15:03:35 +0100
+Subject: [PATCH] Update test_invalid_coverage_source for coverage-6.2
+
+Update test_invalid_coverage_source to make the "No data was collected"
+less strict, as the output has changed in coverage-6.2. This solution
+was suggested by Tom Callaway (@spotrh) on the linked bug.
+
+Fixes #509
+---
+ tests/test_pytest_cov.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index f93d352..6d97949 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -981,7 +981,7 @@ def test_invalid_coverage_source(testdir):
+ '*10 passed*'
+ ])
+ result.stderr.fnmatch_lines([
+- 'Coverage.py warning: No data was collected.*'
++ '*No data was collected.*'
+ ])
+ result.stdout.fnmatch_lines([
+ '*Failed to generate report: No data to report.',
+--
+2.34.1
+
diff --git a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
index 4d424eac1bdd..db4782be9764 100644
--- a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,6 +36,11 @@ distutils_enable_sphinx docs \
dev-python/sphinx-py3doc-enhanced-theme
distutils_enable_tests pytest
+PATCHES=(
+ # https://github.com/pytest-dev/pytest-cov/pull/518
+ "${FILESDIR}"/${P}-coverage-6.2.patch
+)
+
EPYTEST_DESELECT=(
# attempts to install packages via pip (network)
tests/test_pytest_cov.py::test_dist_missing_data
next reply other threads:[~2022-01-23 14:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 14:56 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-02 20:03 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-cov/files/, dev-python/pytest-cov/ Sam James
2021-01-30 21:00 Michał Górny
2020-03-28 18:49 Michał Górny
2019-12-06 4:37 Patrick McLean
2019-11-22 3:15 Patrick McLean
2019-04-12 13:35 Virgil Dupras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1642949805.68ac981a6ec2ad91072cd4aba96492c680b33e7c.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox