valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wheel integration test (#34040)

Browse Source
This commit is contained in:
Nicole Thomas 2016-06-15 15:40:15 -04:00 committed by GitHub
parent 5fee15b485
commit b3751f481f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/wheel/minions.py
View File

@ -2,11 +2,14 @@
'''
Wheel system wrapper for connected minions
'''
# Import Python libs
from __future__ import absolute_import
# Import Salt libs
from salt.utils.cache import CacheCli
import salt.config
import salt.utils.minion
import salt.utils.minions
def connected():
@ -14,7 +17,6 @@ def connected():
List all connected minions on a salt-master
'''
opts = salt.config.master_config(__opts__['conf_file'])
minions = []
if opts.get('con_cache'):
cache_cli = CacheCli(opts)

3
tests/integration/modules/saltutil.py
View File

@ -27,7 +27,8 @@ class SaltUtilModuleTest(integration.ModuleCase):
Tests using the saltutil.wheel function when passing only a function.
'''
ret = self.run_function('saltutil.wheel', ['minions.connected'])
self.assertEqual(ret, ['minion', 'sub_minion'])
self.assertIn('minion', ret)
self.assertIn('sub_minion', ret)
def test_wheel_with_arg(self):
'''