fixed mandatory test
This commit is contained in:
parent
b5a078a385
commit
fe06577ac2
1 changed files with 8 additions and 9 deletions
|
@ -58,15 +58,6 @@ def skipped(*a, **kw):
|
||||||
skipped = item.get('skipped', False)
|
skipped = item.get('skipped', False)
|
||||||
return skipped
|
return skipped
|
||||||
|
|
||||||
def mandatory(a):
|
|
||||||
''' Make a variable mandatory '''
|
|
||||||
try:
|
|
||||||
a
|
|
||||||
except NameError:
|
|
||||||
raise errors.AnsibleFilterError('Mandatory variable not defined.')
|
|
||||||
else:
|
|
||||||
return a
|
|
||||||
|
|
||||||
def regex(value='', pattern='', ignorecase=False, match_type='search'):
|
def regex(value='', pattern='', ignorecase=False, match_type='search'):
|
||||||
''' Expose `re` as a boolean filter using the `search` method by default.
|
''' Expose `re` as a boolean filter using the `search` method by default.
|
||||||
This is likely only useful for `search` and `match` which already
|
This is likely only useful for `search` and `match` which already
|
||||||
|
@ -88,6 +79,14 @@ def search(value, pattern='', ignorecase=False):
|
||||||
''' Perform a `re.search` returning a boolean '''
|
''' Perform a `re.search` returning a boolean '''
|
||||||
return regex(value, pattern, ignorecase, 'search')
|
return regex(value, pattern, ignorecase, 'search')
|
||||||
|
|
||||||
|
def mandatory(a):
|
||||||
|
from jinja2.runtime import Undefined
|
||||||
|
|
||||||
|
''' Make a variable mandatory '''
|
||||||
|
if isinstance(a, Undefined):
|
||||||
|
raise errors.AnsibleFilterError('Mandatory variable not defined.')
|
||||||
|
return a
|
||||||
|
|
||||||
class TestModule(object):
|
class TestModule(object):
|
||||||
''' Ansible core jinja2 tests '''
|
''' Ansible core jinja2 tests '''
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue