| 1 |
commit: 7cb013fa5badfe31ab8975d77062f2e46f85c4e4 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 3 13:11:10 2023 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 3 13:29:35 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb013fa |
| 7 |
|
| 8 |
app-shells/bash-completion: Use epytest to run tests |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../bash-completion/bash-completion-2.11.ebuild | 23 +++++++++++++--------- |
| 13 |
.../bash-completion/bash-completion-9999.ebuild | 23 +++++++++++++--------- |
| 14 |
2 files changed, 28 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild |
| 17 |
index 67ec99d5b6ca..5ee98932da25 100644 |
| 18 |
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild |
| 19 |
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild |
| 20 |
@@ -89,20 +89,25 @@ src_prepare() { |
| 21 |
eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch" |
| 22 |
fi |
| 23 |
|
| 24 |
- # redhat-specific, we strip these completions |
| 25 |
- rm test/t/test_if{down,up}.py || die |
| 26 |
- # not available for icedtea |
| 27 |
- rm test/t/test_javaws.py || die |
| 28 |
- |
| 29 |
eapply_user |
| 30 |
} |
| 31 |
|
| 32 |
src_test() { |
| 33 |
+ local EPYTEST_DESELECT=( |
| 34 |
+ # redhat-specific, we strip these completions |
| 35 |
+ test/t/test_if{down,up}.py |
| 36 |
+ # not available for icedtea |
| 37 |
+ test/t/test_javaws.py |
| 38 |
+ ) |
| 39 |
+ |
| 40 |
# portage's HOME override breaks tests |
| 41 |
- local myhome=$(unset HOME; echo ~) |
| 42 |
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} |
| 43 |
- addpredict "${myhome}" |
| 44 |
- emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none |
| 45 |
+ local -x HOME=$(unset HOME; echo ~) |
| 46 |
+ addpredict "${HOME}" |
| 47 |
+ # used in pytest tests |
| 48 |
+ local -x NETWORK=none |
| 49 |
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 |
| 50 |
+ emake -C completions check |
| 51 |
+ epytest |
| 52 |
} |
| 53 |
|
| 54 |
src_install() { |
| 55 |
|
| 56 |
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild |
| 57 |
index a95ffccbac98..8d39bca2b242 100644 |
| 58 |
--- a/app-shells/bash-completion/bash-completion-9999.ebuild |
| 59 |
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild |
| 60 |
@@ -94,21 +94,26 @@ src_prepare() { |
| 61 |
eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch |
| 62 |
fi |
| 63 |
|
| 64 |
- # redhat-specific, we strip these completions |
| 65 |
- rm test/t/test_if{down,up}.py || die |
| 66 |
- # not available for icedtea |
| 67 |
- rm test/t/test_javaws.py || die |
| 68 |
- |
| 69 |
eapply_user |
| 70 |
eautoreconf |
| 71 |
} |
| 72 |
|
| 73 |
src_test() { |
| 74 |
+ local EPYTEST_DESELECT=( |
| 75 |
+ # redhat-specific, we strip these completions |
| 76 |
+ test/t/test_if{down,up}.py |
| 77 |
+ # not available for icedtea |
| 78 |
+ test/t/test_javaws.py |
| 79 |
+ ) |
| 80 |
+ |
| 81 |
# portage's HOME override breaks tests |
| 82 |
- local myhome=$(unset HOME; echo ~) |
| 83 |
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} |
| 84 |
- addpredict "${myhome}" |
| 85 |
- emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none |
| 86 |
+ local -x HOME=$(unset HOME; echo ~) |
| 87 |
+ addpredict "${HOME}" |
| 88 |
+ # used in pytest tests |
| 89 |
+ local -x NETWORK=none |
| 90 |
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 |
| 91 |
+ emake -C completions check |
| 92 |
+ epytest |
| 93 |
} |
| 94 |
|
| 95 |
src_install() { |
Archives