[Python-modules-commits] [pytest-catchlog] 03/08: Drop old patch, add new proposed pull request 69 one
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Fri Sep 15 17:04:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch debian/master
in repository pytest-catchlog.
commit ab1a287f54b12c6e68c8cc80c4ac2bf81ce726a6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Sep 15 18:45:45 2017 +0200
Drop old patch, add new proposed pull request 69 one
---
debian/patches/69.patch | 135 +++++++++++++++++++++++++++++++++
debian/patches/fix-test-failures.patch | 35 ---------
debian/patches/series | 2 +-
3 files changed, 136 insertions(+), 36 deletions(-)
diff --git a/debian/patches/69.patch b/debian/patches/69.patch
new file mode 100644
index 0000000..ea6d47e
--- /dev/null
+++ b/debian/patches/69.patch
@@ -0,0 +1,135 @@
+From 0fd99a3131f1de9a7ebcf475ddd9af1b365387ae Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <git at the-compiler.org>
+Date: Tue, 18 Jul 2017 16:25:52 +0200
+Subject: [PATCH] Update dependencies and fix tests
+
+- Fix test failures with an up-to-date pytest (fixes #68)
+- Install current versions of all test dependencies
+- Remove pypy3 from Travis as pkg_resources dropped Python 3.2 support
+---
+ .travis.yml | 1 -
+ tests/perf/conftest.py | 6 +++---
+ tests/test_compat.py | 14 +++++++-------
+ tests/test_fixture.py | 8 ++++----
+ tox.ini | 6 +++---
+ 5 files changed, 17 insertions(+), 18 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 5663211..ec57e78 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,7 +7,6 @@ python:
+ - "3.4"
+ - "3.5"
+ - "pypy"
+- - "pypy3"
+ matrix:
+ include:
+ - python: "2.7"
+diff --git a/tests/perf/conftest.py b/tests/perf/conftest.py
+index 8443ff6..d43847d 100644
+--- a/tests/perf/conftest.py
++++ b/tests/perf/conftest.py
+@@ -81,7 +81,7 @@ def pytest_ignore_collect(path):
+ def pytest_itemcollected(item):
+ """This is only called for local tests (under tests/perf_runner/)."""
+ if path_in_dir(item.fspath):
+- item.add_marker('_perf_test')
++ item.add_marker('perf_test')
+
+
+ def pytest_collection_modifyitems(session, config, items):
+@@ -93,7 +93,7 @@ def pytest_collection_modifyitems(session, config, items):
+
+ items[:] = [item
+ for item in items
+- if bool(item.get_marker('_perf_test')) == perf_only]
++ if bool(item.get_marker('perf_test')) == perf_only]
+
+
+ def pytest_terminal_summary(terminalreporter):
+@@ -103,7 +103,7 @@ def pytest_terminal_summary(terminalreporter):
+ if config.getoption('run_perf') in ('yes', 'only'):
+ passed = terminalreporter.stats.get('passed', [])
+ for rep in passed:
+- if '_perf_test' not in rep.keywords:
++ if 'perf_test' not in rep.keywords:
+ continue
+
+ out = '\n'.join(s for _, s in rep.get_sections('Captured stdout'))
+diff --git a/tests/test_compat.py b/tests/test_compat.py
+index df6c0d5..0c527b5 100644
+--- a/tests/test_compat.py
++++ b/tests/test_compat.py
+@@ -24,9 +24,9 @@ def test_foo(caplog):
+ result = testdir.runpytest('-rw')
+ assert result.ret == 0
+ result.stdout.fnmatch_lines('''
+- =*warning summary*=
+- *WL1*test_camel_case_aliases*caplog.setLevel()*deprecated*
+- *WL1*test_camel_case_aliases*caplog.atLevel()*deprecated*
++ =*warning* summary*=
++ *caplog.setLevel()*deprecated*
++ *caplog.atLevel()*deprecated*
+ ''')
+
+
+@@ -50,10 +50,10 @@ def test_foo(caplog):
+ result = testdir.runpytest('-rw')
+ assert result.ret == 0
+ result.stdout.fnmatch_lines('''
+- =*warning summary*=
+- *WL1*test_property_call*caplog.text()*deprecated*
+- *WL1*test_property_call*caplog.records()*deprecated*
+- *WL1*test_property_call*caplog.record_tuples()*deprecated*
++ =*warning* summary*=
++ *caplog.text()*deprecated*
++ *caplog.records()*deprecated*
++ *caplog.record_tuples()*deprecated*
+ ''')
+
+
+diff --git a/tests/test_fixture.py b/tests/test_fixture.py
+index 7523826..bdfa67e 100644
+--- a/tests/test_fixture.py
++++ b/tests/test_fixture.py
+@@ -80,9 +80,9 @@ def test_del_records_inline(caplog):
+ """)
+ result = testdir.runpytest_subprocess(p1)
+ result.stdout.fnmatch_lines([
+- "WL1 test_*.py:1 'caplog.records()' syntax is deprecated,"
++ "*'caplog.records()' syntax is deprecated,"
+ " use 'caplog.records' property (or caplog.clear()) instead",
+- "*1 pytest-warnings*",
++ "*1 *warnings*",
+ ])
+
+
+@@ -93,7 +93,7 @@ def test_inline(caplog):
+ """)
+ result = testdir.runpytest_subprocess(p1)
+ result.stdout.fnmatch_lines([
+- "WL1 test_*.py:1 'caplog.setLevel()' is deprecated,"
++ "*'caplog.setLevel()' is deprecated,"
+ " use 'caplog.set_level()' instead",
+- "*1 pytest-warnings*",
++ "*1 *warnings*",
+ ])
+diff --git a/tox.ini b/tox.ini
+index 4e851bb..dcbaa34 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -3,10 +3,10 @@ envlist = py{26,27,33,34,35}, pypy{,3}, perf
+
+ [testenv]
+ deps =
+- py==1.4.30
+- pytest==3.0.1
++ py==1.4.34
++ pytest==3.1.3
+ pytest-benchmark[aspect]==3.0.0
+- pygal==2.1.1
++ pygal==2.4.0
+ pygaljs==1.0.1
+ commands =
+ {envpython} -m pytest {posargs:tests}
diff --git a/debian/patches/fix-test-failures.patch b/debian/patches/fix-test-failures.patch
deleted file mode 100644
index de2fe6b..0000000
--- a/debian/patches/fix-test-failures.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: fix tests for latest Pytest
-Origin: https://github.com/eisensheng/pytest-catchlog/pull/69/commits/0fd99a3ae
-Bug: https://github.com/eisensheng/pytest-catchlog/issues/68
-Bug-Debian: https://bugs.debian.org/868780
-
---- a/test_pytest_catchlog.py
-+++ b/test_pytest_catchlog.py
-@@ -224,9 +224,9 @@
- result = testdir.runpytest('-rw')
- assert result.ret == 0
- result.stdout.fnmatch_lines('''
-- =*warning summary*=
-- *WL1*test_compat_camel_case_aliases*caplog.setLevel()*deprecated*
-- *WL1*test_compat_camel_case_aliases*caplog.atLevel()*deprecated*
-+ =*warnings summary*=
-+ *caplog.setLevel()*deprecated*
-+ *caplog.atLevel()*deprecated*
- ''')
-
-
-@@ -248,10 +248,10 @@
- result = testdir.runpytest('-rw')
- assert result.ret == 0
- result.stdout.fnmatch_lines('''
-- =*warning summary*=
-- *WL1*test_compat_properties*caplog.text()*deprecated*
-- *WL1*test_compat_properties*caplog.records()*deprecated*
-- *WL1*test_compat_properties*caplog.record_tuples()*deprecated*
-+ =*warnings summary*=
-+ *caplog.text()*deprecated*
-+ *caplog.records()*deprecated*
-+ *caplog.record_tuples()*deprecated*
- ''')
-
-
diff --git a/debian/patches/series b/debian/patches/series
index d3de54c..7235043 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-test-failures.patch
+69.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest-catchlog.git
More information about the Python-modules-commits
mailing list