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

Fixed salt.util import. Added status check to make sure external resource is available

Browse source
This commit is contained in:
Justin Anderson 2016-06-02 14:32:08 -06:00
parent 400a71ec33
commit 2f36f34981
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/integration/modules/gem.py
View file

@ -13,7 +13,8 @@ ensure_in_syspath('../../')
# Import salt libs
import integration
import salt.utils.which
import salt.utils
import salt.utils.http
GEM = 'rake'
GEM_VER = '11.1.2'
@ -21,9 +22,19 @@ OLD_GEM = 'thor'
OLD_VERSION = '0.17.0'
DEFAULT_GEMS = ['bigdecimal', 'rake', 'json', 'rdoc']
def check_status():
'''
Check the status of the rubygems source
'''
ret = salt.utils.http.query('https://rubygems.org', status=True)
if ret['status'] == 200:
return True
return False
@destructiveTest
@skipIf(salt.utils.which('gem') is None, 'Gem is not available on the system')
@skipIf(salt.utils.which('gem') is None, 'Gem is not available')
@skipIf(check_status() is False, 'External source \'https://rubygems.org\' is not available')
class GemModuleTest(integration.ModuleCase):
'''
Validate gem module