Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lint 34644 #34651

Merged
merged 3 commits into from
Jul 13, 2016
Merged

Lint 34644 #34651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c3d8d
Better error handling for __virtual__ in dockerng module
Jul 13, 2016
f45dbe8
Modify lodaer global test to use populated dunders
Jul 13, 2016
f95619a
Lint #34644
Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions salt/modules/dockerng.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,12 @@ def __virtual__():
Only load if docker libs are present
'''
if HAS_DOCKER_PY:
docker_py_versioninfo = _get_docker_py_versioninfo()

try:
docker_py_versioninfo = _get_docker_py_versioninfo()
except Exception:
# May fail if we try to connect to a docker daemon but can't
return (False, 'Docker module found, but no version could be'
' extracted')
# Don't let a failure to interpret the version keep this module from
# loading. Log a warning (log happens in _get_docker_py_versioninfo()).
if docker_py_versioninfo is None:
Expand All @@ -536,7 +540,7 @@ def __virtual__():
if docker_py_versioninfo >= MIN_DOCKER_PY:
try:
docker_versioninfo = version().get('VersionInfo')
except CommandExecutionError:
except Exception:
docker_versioninfo = None

if docker_versioninfo is None or docker_versioninfo >= MIN_DOCKER:
Expand Down
28 changes: 19 additions & 9 deletions tests/integration/loader/globals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import salt.loader
import inspect
import yaml
import copy

# Import 3rd-party libs
import salt.ext.six as six
Expand All @@ -33,6 +34,15 @@ class LoaderGlobalsTest(integration.ModuleCase):

This is intended as a shorter term way of testing these so we don't break the loader
'''

def setUp(self):
# Poor man's classSetUp (not supported in 2.6)
if not hasattr(self, 'minion_mods'):
self.opts = dict(copy.deepcopy(self.master_opts))
self.opts['grains'] = salt.loader.grains(self.opts)
self.utils = salt.loader.utils(self.opts)
self.minion_mods = salt.loader.minion_mods(self.opts, utils=self.utils)

def _verify_globals(self, mod_dict):
'''
Verify that the globals listed in the doc string (from the test) are in these modules
Expand Down Expand Up @@ -64,7 +74,7 @@ def test_auth(self):
- __salt__
- __context__
'''
self._verify_globals(salt.loader.auth(self.master_opts))
self._verify_globals(salt.loader.auth(self.opts))

def test_runners(self):
'''
Expand All @@ -75,7 +85,7 @@ def test_runners(self):
- __grains__
- __context__
'''
self._verify_globals(salt.loader.runner(self.master_opts))
self._verify_globals(salt.loader.runner(self.opts))

def test_returners(self):
'''
Expand All @@ -86,7 +96,7 @@ def test_returners(self):
- __grains__
- __context__
'''
self._verify_globals(salt.loader.returners(self.master_opts, {}))
self._verify_globals(salt.loader.returners(self.opts, {}))

def test_pillars(self):
'''
Expand All @@ -97,13 +107,13 @@ def test_pillars(self):
- __grains__
- __context__
'''
self._verify_globals(salt.loader.pillars(self.master_opts, {}))
self._verify_globals(salt.loader.pillars(self.opts, {}))

def test_tops(self):
'''
Test that tops have: []
'''
self._verify_globals(salt.loader.tops(self.master_opts))
self._verify_globals(salt.loader.tops(self.opts))

def test_outputters(self):
'''
Expand All @@ -113,13 +123,13 @@ def test_outputters(self):
- __grains__
- __context__
'''
self._verify_globals(salt.loader.outputters(self.master_opts))
self._verify_globals(salt.loader.outputters(self.opts))

def test_serializers(self):
'''
Test that serializers have: []
'''
self._verify_globals(salt.loader.serializers(self.master_opts))
self._verify_globals(salt.loader.serializers(self.opts))

def test_states(self):
'''
Expand All @@ -130,7 +140,7 @@ def test_states(self):
- __grains__
- __context__
'''
self._verify_globals(salt.loader.states(self.master_opts, {}, {}))
self._verify_globals(salt.loader.states(self.opts, self.minion_mods, {}))

def test_renderers(self):
'''
Expand All @@ -141,7 +151,7 @@ def test_renderers(self):
- __opts__ # Minion configuration options
- __context__ # Context dict shared amongst all modules of the same type
'''
self._verify_globals(salt.loader.render(self.master_opts, {}))
self._verify_globals(salt.loader.render(self.opts, {}))


if __name__ == '__main__':
Expand Down