aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2019-11-22 21:04:17 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2019-11-22 21:05:02 +0000
commit048edcc19c3887cb4ab5673b72e1679a3a66e77c (patch)
tree7128c7cb1c9ebfb30d2fbb2c7ab4251d1cc8c27e
parent5c8b57cbc5cd3c426ead8571e5d1c93dcea2dc36 (diff)
downloadaports-048edcc19c3887cb4ab5673b72e1679a3a66e77c.tar.gz
aports-048edcc19c3887cb4ab5673b72e1679a3a66e77c.tar.bz2
aports-048edcc19c3887cb4ab5673b72e1679a3a66e77c.tar.xz
community/py3-pytest-xdist: fix acceptance tests
A couple of tests failed due to changes in plularition in the output against what was matched.
-rw-r--r--community/py3-pytest-xdist/APKBUILD6
-rw-r--r--community/py3-pytest-xdist/fix-acceptance-tests.patch40
2 files changed, 44 insertions, 2 deletions
diff --git a/community/py3-pytest-xdist/APKBUILD b/community/py3-pytest-xdist/APKBUILD
index 45ce250ec6..e1a374bd5e 100644
--- a/community/py3-pytest-xdist/APKBUILD
+++ b/community/py3-pytest-xdist/APKBUILD
@@ -10,7 +10,8 @@ license="MIT"
depends="py3-execnet py3-pytest py3-pytest-forked py3-six"
checkdepends="py3-filelock py3-py"
makedepends="py3-setuptools py3-setuptools_scm"
-source="https://files.pythonhosted.org/packages/source/p/pytest-xdist/pytest-xdist-$pkgver.tar.gz"
+source="https://files.pythonhosted.org/packages/source/p/pytest-xdist/pytest-xdist-$pkgver.tar.gz
+ fix-acceptance-tests.patch"
builddir="$srcdir/pytest-xdist-$pkgver"
replaces="pytest-xdist" # Backwards compatibility
@@ -31,4 +32,5 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="978b67df2366d916db62af21f2c610ac5d2de43cecf3260ec9bf52f904098514c3052ce8ca2195c17addd4012f3c5d38ce8a701d26c8158142a821b0d0cf9122 pytest-xdist-1.30.0.tar.gz"
+sha512sums="978b67df2366d916db62af21f2c610ac5d2de43cecf3260ec9bf52f904098514c3052ce8ca2195c17addd4012f3c5d38ce8a701d26c8158142a821b0d0cf9122 pytest-xdist-1.30.0.tar.gz
+97494d31912dbb1631bd3c659dae75809c63474abd600e98a5ec28b43c3e8e8ae49faf3c482fb52516c678b094f86ba554e2da3a7f6e3f9c22d6ad0bb289c4cb fix-acceptance-tests.patch"
diff --git a/community/py3-pytest-xdist/fix-acceptance-tests.patch b/community/py3-pytest-xdist/fix-acceptance-tests.patch
new file mode 100644
index 0000000000..5d039862e7
--- /dev/null
+++ b/community/py3-pytest-xdist/fix-acceptance-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 4537fd0bed..e3a6f5b73c 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -784,7 +784,7 @@ class TestWarnings:
+ )
+ )
+ result = testdir.runpytest(n)
+- result.stdout.fnmatch_lines(["*this is a warning*", "*1 passed, 1 warnings*"])
++ result.stdout.fnmatch_lines(["*this is a warning*", "*1 passed, 1 warning*"])
+
+ @pytest.mark.parametrize("n", ["-n0", "-n1"])
+ def test_custom_subclass(self, testdir, n):
+@@ -808,7 +808,7 @@ class TestWarnings:
+ )
+ testdir.syspathinsert()
+ result = testdir.runpytest(n)
+- result.stdout.fnmatch_lines(["*MyWarning*", "*1 passed, 1 warnings*"])
++ result.stdout.fnmatch_lines(["*MyWarning*", "*1 passed, 1 warning*"])
+
+ @pytest.mark.parametrize("n", ["-n0", "-n1"])
+ def test_unserializable_arguments(self, testdir, n):
+@@ -825,7 +825,7 @@ class TestWarnings:
+ )
+ testdir.syspathinsert()
+ result = testdir.runpytest(n)
+- result.stdout.fnmatch_lines(["*UserWarning*foo.txt*", "*1 passed, 1 warnings*"])
++ result.stdout.fnmatch_lines(["*UserWarning*foo.txt*", "*1 passed, 1 warning*"])
+
+ @pytest.mark.parametrize("n", ["-n0", "-n1"])
+ def test_unserializable_warning_details(self, testdir, n):
+@@ -857,7 +857,7 @@ class TestWarnings:
+ testdir.syspathinsert()
+ result = testdir.runpytest(n)
+ result.stdout.fnmatch_lines(
+- ["*ResourceWarning*unclosed*", "*1 passed, 1 warnings*"]
++ ["*ResourceWarning*unclosed*", "*1 passed, 1 warning*"]
+ )
+
+