Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycountry/
Date: Wed, 27 Nov 2019 01:50:01
Message-Id: 1574819391.11ac9aad456a4852bd959d8fe9b409b47a7d2be9.bman@gentoo
1 commit: 11ac9aad456a4852bd959d8fe9b409b47a7d2be9
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 27 01:47:52 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 27 01:49:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ac9aad
7
8 dev-python/pycountry: fix tests
9
10 * Tests are successful on both amd64 and arm64 but pytest was leaving behind the
11 .pytest_cache dir causing a subsequent merge to fail.
12
13 * add the cache_dir option to pytest call so that tests are run from ${T}
14
15 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
16
17 dev-python/pycountry/pycountry-18.5.26.ebuild | 2 +-
18 dev-python/pycountry/pycountry-19.8.18.ebuild | 2 +-
19 2 files changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/dev-python/pycountry/pycountry-18.5.26.ebuild b/dev-python/pycountry/pycountry-18.5.26.ebuild
22 index bf3621a2c76..1831d0f30e7 100644
23 --- a/dev-python/pycountry/pycountry-18.5.26.ebuild
24 +++ b/dev-python/pycountry/pycountry-18.5.26.ebuild
25 @@ -26,6 +26,6 @@ python_test() {
26 if [[ ${EPYTHON} == pypy* ]]; then
27 sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
28 fi
29 - pytest -vv || die
30 + pytest -o cache_dir="${T}" -vv || die
31 popd > /dev/null || die
32 }
33
34 diff --git a/dev-python/pycountry/pycountry-19.8.18.ebuild b/dev-python/pycountry/pycountry-19.8.18.ebuild
35 index 99429b4ab6c..4e711c93a32 100644
36 --- a/dev-python/pycountry/pycountry-19.8.18.ebuild
37 +++ b/dev-python/pycountry/pycountry-19.8.18.ebuild
38 @@ -26,6 +26,6 @@ python_test() {
39 if [[ ${EPYTHON} == pypy* ]]; then
40 sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
41 fi
42 - pytest -vv || die
43 + pytest -o cache_dir="${T}" -vv || die
44 popd > /dev/null || die
45 }