Deprecate quiet kwarg in cmd.run state module

doc/topics/releases/neon.rst

@@ -147,6 +147,10 @@ Module Deprecations
         - :py:func:`dockermod.load <salt.modules.dockermod.load>`
         - :py:func:`dockermod.tag <salt.modules.dockermod.tag_>`
 
+- The cmd state module has removed the ``quiet`` kwarg from the
+  :py:func:`cmd.run <salt.modules.cmdmod.run>` function. Please
+  set ``output_loglevel`` to ``quiet`` instead.
+
 State Deprecations
 ------------------
 

salt/states/cmd.py

@@ -796,13 +796,6 @@ def run(name,
 
         .. versionadded:: 2018.3.0
 
-    quiet
-        This option no longer has any functionality and will be removed, please
-        set ``output_loglevel`` to ``quiet`` to suppress logging of the
-        command.
-
-        .. deprecated:: 2014.1.0
-
     timeout
         If the command has not terminated after timeout seconds, send the
         subprocess sigterm, and if sigterm is ignored, follow up with sigkill
@@ -868,18 +861,6 @@ def run(name,
            'result': False,
            'comment': ''}
 
-    if 'quiet' in kwargs:
-        quiet = kwargs.pop('quiet')
-        msg = (
-            'The \'quiet\' argument for cmd.run has been deprecated since '
-            '2014.1.0 and will be removed as of the Neon release. Please set '
-            '\'output_loglevel\' to \'quiet\' instead.'
-        )
-        salt.utils.versions.warn_until('Neon', msg)
-        ret.setdefault('warnings', []).append(msg)
-    else:
-        quiet = False
-
     test_name = None
     if not isinstance(stateful, list):
         stateful = stateful is True
@@ -906,7 +887,6 @@ def run(name,
                        'umask': umask,
                        'output_loglevel': output_loglevel,
                        'hide_output': hide_output,
-                       'quiet': quiet,
                        'success_retcodes': success_retcodes})
 
     cret = mod_run_check(cmd_kwargs, onlyif, unless, creates)

tests/integration/states/test_cmd.py

@@ -39,6 +39,15 @@ def test_run_simple(self):
         ret = self.run_state('cmd.run', name=self.__cmd, cwd=tempfile.gettempdir())
         self.assertSaltTrueReturn(ret)
 
+    def test_run_output_loglevel(self):
+        '''
+        cmd.run with output_loglevel=quiet
+        '''
+        ret = self.run_state('cmd.run', name=self.__cmd,
+                             cwd=tempfile.gettempdir(),
+                             output_loglevel='quiet')
+        self.assertSaltTrueReturn(ret)
+
     def test_test_run_simple(self):
         '''
         cmd.run test interface

tests/unit/modules/test_cmdmod.py

@@ -21,6 +21,7 @@
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.unit import TestCase, skipIf
 from tests.support.runtests import RUNTIME_VARS
+from tests.support.helpers import TestsLoggingHandler
 from tests.support.mock import (
     mock_open,
     Mock,
@@ -437,6 +438,38 @@ def test_run_all_output_encoding(self):
 
         self.assertEqual(ret['stdout'], stdout)
 
+    def test_run_all_output_loglevel_quiet(self):
+        '''
+        Test that specifying quiet for loglevel
+        does not log the command.
+        '''
+        stdout = b'test'
+        proc = MagicMock(return_value=MockTimedProc(stdout=stdout))
+
+        msg = "INFO:Executing command 'some command' in directory"
+        with patch('salt.utils.timed_subprocess.TimedProc', proc):
+            with TestsLoggingHandler() as log_handler:
+                ret = cmdmod.run_all('some command', output_loglevel='quiet')
+                assert not [x for x in log_handler.messages if msg in x]
+
+        self.assertEqual(ret['stdout'], stdout)
+
+    def test_run_all_output_loglevel_debug(self):
+        '''
+        Test that specifying debug for loglevel
+        does log the command.
+        '''
+        stdout = b'test'
+        proc = MagicMock(return_value=MockTimedProc(stdout=stdout))
+
+        msg = "INFO:Executing command 'some command' in directory"
+        with patch('salt.utils.timed_subprocess.TimedProc', proc):
+            with TestsLoggingHandler() as log_handler:
+                ret = cmdmod.run_all('some command', output_loglevel='debug')
+                assert [x for x in log_handler.messages if msg in x]
+
+        self.assertEqual(ret['stdout'], stdout)
+
     def test_run_chroot_mount(self):
         '''
         Test cmdmod.run_chroot mount / umount balance