Merge branch 'galaxy_github_archive' of git://github.com/willthames/ansible into devel

Conflicts:
	lib/ansible/utils/__init__.py
This commit is contained in:
Michael DeHaan 2014-08-22 13:58:50 -04:00
commit d87830e1cc
2 changed files with 15 additions and 6 deletions

View file

@ -824,7 +824,7 @@ class TestUtils(unittest.TestCase):
}
),
(
# test that http://github URLs are assumed git+http://
# test that http://github URLs are assumed git+http:// unless they end in .tar.gz
"http://github.com/ansible/fakerole/fake",
{
'scm' : 'git',
@ -832,6 +832,16 @@ class TestUtils(unittest.TestCase):
'version' : '',
'name' : 'fake'
}
),
(
# test that http://github URLs are assumed git+http:// unless they end in .tar.gz
"http://github.com/ansible/fakerole/fake/archive/master.tar.gz",
{
'scm' : None,
'src' : 'http://github.com/ansible/fakerole/fake/archive/master.tar.gz',
'version' : '',
'name' : 'master'
}
)
]
for (spec, result) in tests: