wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update tests for ansible-galaxy CLI additions.

Browse source
This commit is contained in:
Michael DeHaan 2014-08-22 14:01:15 -04:00
parent d87830e1cc
commit 8a0045baad
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/utils/__init__.py
View file

@ -381,12 +381,16 @@ def role_spec_parse(role_spec):
# } # }
role_spec = role_spec.strip() role_spec = role_spec.strip()
role_version = 'master' role_version = ''
if role_spec == "" or role_spec.startswith("#"): if role_spec == "" or role_spec.startswith("#"):
return (None, None, None, None) return (None, None, None, None)
tokens = [s.strip() for s in role_spec.split(',')] tokens = [s.strip() for s in role_spec.split(',')]
if not tokens[0].endswith('.tar.gz'):
# pick a reasonable default branch
role_version = 'master'
# assume https://github.com URLs are git+https:// URLs and not # assume https://github.com URLs are git+https:// URLs and not
# tarballs unless they end in '.zip' # tarballs unless they end in '.zip'
if 'github.com/' in tokens[0] and not tokens[0].startswith("git+") and not tokens[0].endswith('.tar.gz'): if 'github.com/' in tokens[0] and not tokens[0].startswith("git+") and not tokens[0].endswith('.tar.gz'):

2
test/units/TestUtils.py
View file

@ -829,7 +829,7 @@ class TestUtils(unittest.TestCase):
{ {
'scm' : 'git', 'scm' : 'git',
'src' : 'http://github.com/ansible/fakerole/fake', 'src' : 'http://github.com/ansible/fakerole/fake',
'version' : '', 'version' : 'master',
'name' : 'fake' 'name' : 'fake'
} }
), ),