|
 |
87589a7 |
From 757d9457038c9482c26f12db5898935d6c1cf07a Mon Sep 17 00:00:00 2001
|
|
|
87589a7 |
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
|
87589a7 |
Date: Wed, 24 Apr 2019 18:12:47 +0200
|
|
|
87589a7 |
Subject: [PATCH] Support pytest 4
|
|
|
87589a7 |
|
|
|
87589a7 |
See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
|
|
|
87589a7 |
---
|
|
|
87589a7 |
setup.py | 2 +-
|
|
|
87589a7 |
tests/test_expected.py | 12 ++++++------
|
|
|
87589a7 |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
87589a7 |
|
|
|
87589a7 |
diff --git a/setup.py b/setup.py
|
|
|
87589a7 |
index 6f2c224..77039af 100755
|
|
|
87589a7 |
--- a/setup.py
|
|
|
87589a7 |
+++ b/setup.py
|
|
|
87589a7 |
@@ -61,5 +61,5 @@ def pkgconfig(package, min_version=None, **kw):
|
|
|
87589a7 |
download_url="https://github.com/ignatenkobrain/python-smartcols/archive/v{}.tar.gz".format(VERSION),
|
|
|
87589a7 |
ext_modules=cythonize(extensions, gdb_debug=DEBUG),
|
|
|
87589a7 |
setup_requires=["Cython>=0.24.0", "pytest-runner"],
|
|
|
87589a7 |
- tests_require=["pytest>=2.8"],
|
|
|
87589a7 |
+ tests_require=["pytest>=3.6"],
|
|
|
87589a7 |
)
|
|
|
87589a7 |
diff --git a/tests/test_expected.py b/tests/test_expected.py
|
|
|
87589a7 |
index 94aadd6..eab4ea1 100644
|
|
|
87589a7 |
--- a/tests/test_expected.py
|
|
|
87589a7 |
+++ b/tests/test_expected.py
|
|
|
87589a7 |
@@ -16,7 +16,7 @@
|
|
|
87589a7 |
data("data-id"),
|
|
|
87589a7 |
data("data-parent"),
|
|
|
87589a7 |
data("data-string-long")]),
|
|
|
87589a7 |
- pytest.mark.xfail(("tree-json", [
|
|
|
87589a7 |
+ pytest.param("tree-json", [
|
|
|
87589a7 |
"--nlines", "10",
|
|
|
87589a7 |
"--json",
|
|
|
87589a7 |
"--tree-id-column", "1",
|
|
|
87589a7 |
@@ -28,7 +28,7 @@
|
|
|
87589a7 |
data("data-string"),
|
|
|
87589a7 |
data("data-id"),
|
|
|
87589a7 |
data("data-parent"),
|
|
|
87589a7 |
- data("data-string-long")])),
|
|
|
87589a7 |
+ data("data-string-long")], marks=pytest.mark.xfail),
|
|
|
87589a7 |
("tree-middle", [
|
|
|
87589a7 |
"--nlines", "10",
|
|
|
87589a7 |
"--tree-id-column", "0",
|
|
|
87589a7 |
@@ -149,7 +149,7 @@
|
|
|
87589a7 |
data("data-id"),
|
|
|
87589a7 |
data("data-parent"),
|
|
|
87589a7 |
data("data-string-nl")]),
|
|
|
87589a7 |
- pytest.mark.xfail(("raw", [
|
|
|
87589a7 |
+ pytest.param("raw", [
|
|
|
87589a7 |
"--nlines", "10",
|
|
|
87589a7 |
"--raw",
|
|
|
87589a7 |
"--column", data("col-name"),
|
|
|
87589a7 |
@@ -157,8 +157,8 @@
|
|
|
87589a7 |
"--column", data("col-trunc"),
|
|
|
87589a7 |
data("data-string"),
|
|
|
87589a7 |
data("data-number"),
|
|
|
87589a7 |
- data("data-string-long")])),
|
|
|
87589a7 |
- pytest.mark.xfail(("export", [
|
|
|
87589a7 |
+ data("data-string-long")], marks=pytest.mark.xfail),
|
|
|
87589a7 |
+ pytest.param("export", [
|
|
|
87589a7 |
"--nlines", "10",
|
|
|
87589a7 |
"--export",
|
|
|
87589a7 |
"--column", data("col-name"),
|
|
|
87589a7 |
@@ -166,7 +166,7 @@
|
|
|
87589a7 |
"--column", data("col-trunc"),
|
|
|
87589a7 |
data("data-string"),
|
|
|
87589a7 |
data("data-number"),
|
|
|
87589a7 |
- data("data-string-long")])),
|
|
|
87589a7 |
+ data("data-string-long")], marks=pytest.mark.xfail),
|
|
|
87589a7 |
("column-separator", [
|
|
|
87589a7 |
"--nlines", "10",
|
|
|
87589a7 |
"--colsep", "|",
|