Updating tests to reflect changes. Updating to include passed function name in returned docs with message that it is not available.

salt/cli/caller.py

@@ -167,6 +167,7 @@ class BaseCaller(object):
         if fun not in self.minion.functions:
             docs = self.minion.functions['sys.doc']('{0}*'.format(fun))
             if docs:
+                docs[fun] = self.minion.functions.missing_fun_string(fun)
                 ret['out'] = 'nested'
                 ret['return'] = docs
                 return ret

salt/client/mixins.py

@@ -442,7 +442,6 @@ class SyncClientMixin(object):
                 _use_fnmatch = True
             else:
                 target_mod = arg + '.' if not arg.endswith('.') else arg
-            log.debug('target_mod {}'.format(target_mod))
             if _use_fnmatch:
                 docs = [(fun, self.functions[fun].__doc__)
                         for fun in fnmatch.filter(self.functions, target_mod)]

salt/minion.py

@@ -1521,7 +1521,8 @@ class Minion(MinionBase):
                 ret['out'] = 'nested'
         else:
             docs = minion_instance.functions['sys.doc']('{0}*'.format(function_name))
-            if all(docs[doc] for doc in docs):
+            if docs:
+                docs[function_name] = minion_instance.functions.missing_fun_string(function_name)
                 ret['return'] = docs
             else:
                 ret['return'] = minion_instance.functions.missing_fun_string(function_name)

tests/integration/files/file/base/_modules/runtests_decorators.py

@@ -9,6 +9,11 @@ import salt.utils.decorators
 
 
 def _fallbackfunc():
+    '''
+    CLI Example:
+
+    .. code-block:: bash
+    '''
     return False, 'fallback'
 
 
@@ -33,11 +38,21 @@ def booldependsTrue():
 
 @salt.utils.decorators.depends(False)
 def booldependsFalse():
+    '''
+    CLI Example:
+
+    .. code-block:: bash
+    '''
     return True
 
 
 @salt.utils.decorators.depends('time')
 def depends():
+    '''
+    CLI Example:
+
+    .. code-block:: bash
+    '''
     ret = {'ret': True,
            'time': time.time()}
     return ret
@@ -45,6 +60,11 @@ def depends():
 
 @salt.utils.decorators.depends('time123')
 def missing_depends():
+    '''
+    CLI Example:
+
+    .. code-block:: bash
+    '''
     return True
 
 
@@ -62,6 +82,11 @@ def depends_will_not_fallback():
 
 @salt.utils.decorators.depends('time123', fallback_function=_fallbackfunc)
 def missing_depends_will_fallback():
+    '''
+    CLI Example:
+
+    .. code-block:: bash
+    '''
     ret = {'ret': True,
            'time': time.time()}
     return ret

tests/integration/modules/test_decorators.py

@@ -22,8 +22,9 @@ class DecoratorTest(ModuleCase):
         self.assertTrue(isinstance(ret['time'], float))
 
     def test_missing_depends(self):
-        self.assertIn(
-                'is not available',
+        self.assertEqual(
+                {'runtests_decorators.missing_depends_will_fallback': '\n    CLI Example:\n\n    ',
+                 'runtests_decorators.missing_depends': "'runtests_decorators.missing_depends' is not available."},
                 self.run_function('runtests_decorators.missing_depends'
                     )
                 )