dev-python/pytest-salt: bug fix

When pytest-salt is involved in other package's testing suite, it can
cause the corresponding package suite to fail.

Closes:https://bugs.gentoo.org/740400

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Denoncin <ddenoncin@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19735
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
This commit is contained in:
David Denoncin
2021-03-02 15:02:19 +01:00
committed by Patrick McLean
parent 9e475c90b6
commit dc8debaf1f
2 changed files with 18 additions and 0 deletions

View File

@@ -0,0 +1,14 @@
Fixes a Doctestitem has no attribute 'fixturenames'
Fix by David Denoncin based on https://github.com/saltstack/pytest-salt/issues/48
--- a/pytestsalt/fixtures/daemons.py 2021-03-02 15:19:40.500254583 +0100
+++ b/pytestsalt/fixtures/daemons.py 2021-03-02 15:20:40.706920871 +0100
@@ -1658,7 +1658,6 @@
Fixtures injection based on markers
'''
for fixture in ('salt_master', 'salt_minion', 'salt_call', 'salt', 'salt_key', 'salt_run'):
- if fixture in item.fixturenames:
- after_start_fixture = '{}_after_start'.format(fixture)
+ if fixture in getattr(item, 'fixturenames', ()):
if after_start_fixture not in item.fixturenames:
item.fixturenames.append(after_start_fixture)

View File

@@ -28,6 +28,10 @@ RDEPEND="
# test? ( app-admin/salt[${PYTHON_USEDEP}] )
#"
PATCHES=(
"${FILESDIR}/${PN}-2020.1.27-r2.patch"
)
# tests need network access
RESTRICT="test"