Start of unit tests for split_args function, moved split_args to utils since not needed by modules (so far).

This commit is contained in:
Michael DeHaan
2014-07-24 20:15:04 -04:00
parent b5d64fdb36
commit 630f080cf0
5 changed files with 206 additions and 150 deletions

View File

@@ -26,11 +26,10 @@ import optparse
import operator
from ansible import errors
from ansible import __version__
from ansible.utils import template
from ansible.utils.display_functions import *
from ansible.utils.plugins import *
from ansible.callbacks import display
from ansible.module_utils.basic import split_args
from ansible.utils.splitter import split_args
import ansible.constants as C
import ast
import time
@@ -231,6 +230,7 @@ def is_changed(result):
return (result.get('changed', False) in [ True, 'True', 'true'])
def check_conditional(conditional, basedir, inject, fail_on_undefined=False):
from ansible.utils import template
if conditional is None or conditional == '':
return True
@@ -325,6 +325,9 @@ def path_dwim_relative(original, dirname, source, playbook_base, check=True):
''' find one file in a directory one level up in a dir named dirname relative to current '''
# (used by roles code)
from ansible.utils import template
basedir = os.path.dirname(original)
if os.path.islink(basedir):
basedir = unfrackpath(basedir)
@@ -1217,6 +1220,8 @@ def safe_eval(expr, locals={}, include_exceptions=False):
def listify_lookup_plugin_terms(terms, basedir, inject):
from ansible.utils import template
if isinstance(terms, basestring):
# someone did:
# with_items: alist