IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 15:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests.beakerlib_plugin: Add argument of generated tests to test captions

Browse Source 
To differentiate between individual tests in BeakerLib output,
the argument needs to be added to the test name. Since Nose
doesn't provide a way to get the argument in a plugin,
a `test_argument` attribute must be added to the test function
to support this, simlarly to how `description` is used to set
individual "docstrings".

Add test_argument to the generated tests in the CA-less suite.
This commit is contained in:
Petr Viktorin 2013-09-24 13:56:21 +02:00
parent 0ad339a731
commit f2e8624e76
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipatests/beakerlib_plugin.py
View File

@ -233,7 +233,14 @@ class BeakerLibPlugin(Plugin):
caption = test.shortDescription() caption = test.shortDescription()
if not caption: if not caption:
caption = 'Nose method (no docstring)' caption = 'Nose method (no docstring)'
phase_name = "%s: %s" % (test.id().replace('.', '-'), caption) phase_name = test.id().replace('.', '-')
method = test
while hasattr(method, 'test'):
method = method.test
argument = getattr(method, 'test_argument', None)
if argument:
phase_name += '-%s' % re.sub('[^-a-zA-Z0-9]+', '_', str(argument))
phase_name += ": %s" % caption
self.run_beakerlib_command(['rlPhaseStart', 'FAIL', phase_name]) self.run_beakerlib_command(['rlPhaseStart', 'FAIL', phase_name])
while hasattr(test, 'test'): while hasattr(test, 'test'):

1
ipatests/test_integration/test_caless.py
View File

@ -1092,6 +1092,7 @@ class TestIPACommands(CALessBase):
'cert-status'): 'cert-status'):
func = lambda: self.check_ipa_command_not_available(cmd) func = lambda: self.check_ipa_command_not_available(cmd)
func.description = 'Verify that %s command is not available' % cmd func.description = 'Verify that %s command is not available' % cmd
func.test_argument = cmd
yield (func, ) yield (func, )
def test_cert_help_unavailable(self): def test_cert_help_unavailable(self):