saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #47973 from terminalmage/fix-testinfra

Browse source 
salt.modules.testinframod: fix TypeError invoking types.FunctionType
This commit is contained in:
Nicole Thomas 2018-06-06 09:53:45 -04:00 • committed by GitHub
commit 864d640633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/modules/testinframod.py
View file

@ -16,7 +16,6 @@ import types
log = logging.getLogger(__name__)
from salt.ext import six
try:
import testinfra
from testinfra import modules
@ -218,7 +217,7 @@ def _copy_function(module_name, name=None):
comparison: eq
```
"""
log.debug('Generating function for %s module', module_name)
log.debug('Generating function for testinfra.%s', module_name)
def _run_tests(name, **methods):
success = True
@ -278,9 +277,15 @@ def _copy_function(module_name, name=None):
))
return success, pass_msgs, fail_msgs
func = _run_tests
if name is not None:
# types.FunctionType requires a str for __name__ attribute, using a
# unicode type will result in a TypeError.
name = str(name) # future lint: disable=blacklisted-function
else:
name = func.__name__
return types.FunctionType(func.__code__,
func.__globals__,
name or func.__name__,
name,
func.__defaults__,
func.__closure__)
@ -297,7 +302,7 @@ def _register_functions():
modules_ = [module_ for module_ in modules.modules]
for mod_name in modules_:
mod_func = _copy_function(mod_name, six.text_type(mod_name))
mod_func = _copy_function(mod_name, mod_name)
mod_func.__doc__ = _build_doc(mod_name)
__all__.append(mod_name)
globals()[mod_name] = mod_func