From 0d4b799969e19227addd56bf5114d3db085ae55e Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Thu, 8 Nov 2018 11:10:08 -0700
Subject: [PATCH 01/26] Upgrade requests to 2.20.1

---
 pkg/osx/req.txt     | 2 +-
 pkg/windows/req.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt
index 38b2f275a1..ab5549cd4a 100644
--- a/pkg/osx/req.txt
+++ b/pkg/osx/req.txt
@@ -23,7 +23,7 @@ python-dateutil==2.6.1
 python-gnupg==0.4.1
 PyYAML==3.12
 pyzmq==17.0.0
-requests==2.18.4
+requests==2.20.1
 singledispatch==3.4.0.3
 six==1.11.0
 smmap==0.9.0
diff --git a/pkg/windows/req.txt b/pkg/windows/req.txt
index 16b4f447bc..f597c8e978 100644
--- a/pkg/windows/req.txt
+++ b/pkg/windows/req.txt
@@ -31,7 +31,7 @@ pythonnet==2.3.0
 pywin32==223
 PyYAML==3.12
 pyzmq==16.0.3
-requests==2.18.4
+requests==2.20.1
 singledispatch==3.4.0.3
 smmap==0.9.0
 timelib==0.2.4

From b85c5bf6d99b0ece6e5648231a0fd823f68c9ad0 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Fri, 14 Dec 2018 09:16:09 -0800
Subject: [PATCH 02/26] Adding a test to ensure exception handling is correct.

---
 tests/unit/modules/test_mysql.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/unit/modules/test_mysql.py b/tests/unit/modules/test_mysql.py
index af11d461dd..25d45a0de8 100644
--- a/tests/unit/modules/test_mysql.py
+++ b/tests/unit/modules/test_mysql.py
@@ -282,6 +282,23 @@ class MySQLTestCase(TestCase, LoaderModuleMockMixin):
     def test_query(self):
         self._test_call(mysql.query, 'SELECT * FROM testdb', 'testdb', 'SELECT * FROM testdb')
 
+    def test_query_error(self):
+        def mock_execute(cur, query):
+            '''
+            Mock of info method
+            '''
+            raise MySQLdb.OperationalError(9999, 'Something Went Wrong')
+
+        connect_mock = MagicMock()
+        with patch.object(mysql, '_connect', connect_mock):
+            with patch.dict(mysql.__salt__, {'config.option': MagicMock()}):
+                with patch.object(mysql, '_execute') as execute_mock:
+                    execute_mock.side_effect = mock_execute
+                    mysql.query('testdb', 'SELECT * FROM testdb')
+            self.assertIn('mysql.error', mysql.__context__)
+            expected = 'MySQL Error 9999: Something Went Wrong'
+            self.assertEqual(mysql.__context__['mysql.error'], expected)
+
     def _test_call(self, function, expected_sql, *args, **kwargs):
         connect_mock = MagicMock()
         with patch.object(mysql, '_connect', connect_mock):

From af3e1459c3472d0394e536723299d97761507b57 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Fri, 14 Dec 2018 09:28:44 -0800
Subject: [PATCH 03/26] Cleanup.

---
 tests/unit/modules/test_mysql.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/unit/modules/test_mysql.py b/tests/unit/modules/test_mysql.py
index 25d45a0de8..43bad1954c 100644
--- a/tests/unit/modules/test_mysql.py
+++ b/tests/unit/modules/test_mysql.py
@@ -283,17 +283,11 @@ class MySQLTestCase(TestCase, LoaderModuleMockMixin):
         self._test_call(mysql.query, 'SELECT * FROM testdb', 'testdb', 'SELECT * FROM testdb')
 
     def test_query_error(self):
-        def mock_execute(cur, query):
-            '''
-            Mock of info method
-            '''
-            raise MySQLdb.OperationalError(9999, 'Something Went Wrong')
-
         connect_mock = MagicMock()
         with patch.object(mysql, '_connect', connect_mock):
             with patch.dict(mysql.__salt__, {'config.option': MagicMock()}):
-                with patch.object(mysql, '_execute') as execute_mock:
-                    execute_mock.side_effect = mock_execute
+                side_effect = MySQLdb.OperationalError(9999, 'Something Went Wrong')
+                with patch.object(mysql, '_execute', MagicMock(side_effect=side_effect)):
                     mysql.query('testdb', 'SELECT * FROM testdb')
             self.assertIn('mysql.error', mysql.__context__)
             expected = 'MySQL Error 9999: Something Went Wrong'

From fc9c64b6227bfc6301eb067cfc754d2b5708b68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Jouannet?= <remi.jouannet@outscale.com>
Date: Fri, 14 Dec 2018 12:38:14 +0100
Subject: [PATCH 04/26] fix typo in file.managed documentation

---
 salt/states/file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/states/file.py b/salt/states/file.py
index 35b4bcb456..1b94239929 100644
--- a/salt/states/file.py
+++ b/salt/states/file.py
@@ -1995,7 +1995,7 @@ def managed(name,
 
     contents_pillar
         .. versionadded:: 0.17.0
-        .. versionchanged: 2016.11.0
+        .. versionchanged:: 2016.11.0
             contents_pillar can also be a list, and the pillars will be
             concatinated together to form one file.
 

From fd73f86c75575ff3af96cb9fe323a087964892d1 Mon Sep 17 00:00:00 2001
From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
Date: Tue, 4 Dec 2018 16:09:52 +0100
Subject: [PATCH 05/26] Catch UnicodeDecodeErrors in id verification

Do not crash if the id cannot be decoded. An invalid id provided by an untrusted client can DOS the master.
---
 salt/utils/verify.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/utils/verify.py b/salt/utils/verify.py
index 802b37339c..88d2efe0aa 100644
--- a/salt/utils/verify.py
+++ b/salt/utils/verify.py
@@ -490,7 +490,7 @@ def valid_id(opts, id_):
         if any(x in id_ for x in ('/', '\\', '\0')):
             return False
         return bool(clean_path(opts['pki_dir'], id_))
-    except (AttributeError, KeyError, TypeError):
+    except (AttributeError, KeyError, TypeError, UnicodeDecodeError):
         return False
 
 

From 676a12ac553ce157caecc37dcf2021d8c92e76a1 Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Fri, 14 Dec 2018 16:03:59 -0600
Subject: [PATCH 06/26] Fix compound matching in eauth

The auth validation functions were using flawed logic to validate the
expressions configured for a given eauth plugin. To "expand" the
expression, it would use `salt.utils.minions.parse_target()` to analyze
the expression. However, this function was intended to be used on
individual words in a compound expression, not on a compound expression
as a whole. This means that any multi-word compound expression would
fail to validate. By assuming that the euth expression is compound and
using `check_minions()` to get the list of minions that match the
expression, we ensure that it is properly validated.
---
 salt/utils/minions.py | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/salt/utils/minions.py b/salt/utils/minions.py
index 6c9504ec91..77bbf25288 100644
--- a/salt/utils/minions.py
+++ b/salt/utils/minions.py
@@ -661,26 +661,6 @@ class CkMinions(object):
             minions = []
         return minions
 
-    def _expand_matching(self, auth_entry):
-        ref = {'G': 'grain',
-               'P': 'grain_pcre',
-               'I': 'pillar',
-               'J': 'pillar_pcre',
-               'L': 'list',
-               'S': 'ipcidr',
-               'E': 'pcre',
-               'N': 'node',
-               None: 'compound'}
-
-        target_info = parse_target(auth_entry)
-        if not target_info:
-            log.error('Failed to parse valid target "{0}"'.format(auth_entry))
-
-        v_matcher = ref.get(target_info['engine'])
-        v_expr = target_info['pattern']
-
-        return set(self.check_minions(v_expr, v_matcher))
-
     def validate_tgt(self, valid, expr, tgt_type, minions=None, expr_form=None):
         '''
         Return a Bool. This function returns if the expression sent in is
@@ -697,7 +677,7 @@ class CkMinions(object):
             )
             tgt_type = expr_form
 
-        v_minions = self._expand_matching(valid)
+        v_minions = set(self.check_minions(valid, 'compound'))
         if minions is None:
             minions = set(self.check_minions(expr, tgt_type))
         else:
@@ -824,7 +804,7 @@ class CkMinions(object):
                     continue
             allowed_minions.update(set(auth_list_entry.keys()))
             for key in auth_list_entry:
-                for match in self._expand_matching(key):
+                for match in set(self.check_minions(key, 'compound')):
                     if match in auth_dictionary:
                         auth_dictionary[match].extend(auth_list_entry[key])
                     else:
@@ -832,7 +812,7 @@ class CkMinions(object):
 
         allowed_minions_from_auth_list = set()
         for next_entry in allowed_minions:
-            allowed_minions_from_auth_list.update(self._expand_matching(next_entry))
+            allowed_minions_from_auth_list.update(set(self.check_minions(next_entry, 'compound')))
         # 'minions' here are all the names of minions matched by the target
         # if we take out all the allowed minions, and there are any left, then
         # the target includes minions that are not allowed by eauth

From ed2bed3e86664628849a4b05fba9fcc76434096d Mon Sep 17 00:00:00 2001
From: angeloudy <angeloudy@yahoo.com>
Date: Wed, 12 Sep 2018 16:14:35 +1000
Subject: [PATCH 07/26] fix command line options

---
 salt/modules/archive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/modules/archive.py b/salt/modules/archive.py
index 76cd3eeb97..7f44f506c0 100644
--- a/salt/modules/archive.py
+++ b/salt/modules/archive.py
@@ -922,7 +922,7 @@ def cmd_unzip(zip_file,
     if password:
         cmd.extend(['-P', password])
     if options:
-        cmd.append('{0}'.format(options))
+        cmd = cmd + options.split()
     cmd.extend(['{0}'.format(zip_file), '-d', '{0}'.format(dest)])
 
     if excludes is not None:

From 925a9c905cb1913e2c6339c3d700373ea1ada04d Mon Sep 17 00:00:00 2001
From: Tao ZHOU <angeloudy@gmail.com>
Date: Fri, 19 Oct 2018 16:08:31 +1100
Subject: [PATCH 08/26] Update archive.py

---
 salt/modules/archive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/modules/archive.py b/salt/modules/archive.py
index 7f44f506c0..209c04356f 100644
--- a/salt/modules/archive.py
+++ b/salt/modules/archive.py
@@ -922,7 +922,7 @@ def cmd_unzip(zip_file,
     if password:
         cmd.extend(['-P', password])
     if options:
-        cmd = cmd + options.split()
+        cmd = cmd.extend(shlex.split(options))
     cmd.extend(['{0}'.format(zip_file), '-d', '{0}'.format(dest)])
 
     if excludes is not None:

From c93dbfaa38d184df7ea8ef9d5a500b69474be700 Mon Sep 17 00:00:00 2001
From: Tao ZHOU <angeloudy@gmail.com>
Date: Mon, 17 Dec 2018 14:25:59 +1100
Subject: [PATCH 09/26] Update archive.py

---
 salt/modules/archive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/modules/archive.py b/salt/modules/archive.py
index 209c04356f..bd414379f4 100644
--- a/salt/modules/archive.py
+++ b/salt/modules/archive.py
@@ -922,7 +922,7 @@ def cmd_unzip(zip_file,
     if password:
         cmd.extend(['-P', password])
     if options:
-        cmd = cmd.extend(shlex.split(options))
+        cmd.extend(shlex.split(options))
     cmd.extend(['{0}'.format(zip_file), '-d', '{0}'.format(dest)])
 
     if excludes is not None:

From da1fc3288fa6656017d73062874c226f92cb9ac2 Mon Sep 17 00:00:00 2001
From: Damon Atkins <damon-atkins@users.noreply.github.com>
Date: Wed, 19 Dec 2018 18:31:16 +1100
Subject: [PATCH 10/26] change params.CHANGE_BRANCH to env.CHANGE_BRANCH

---
 .ci/lint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/lint b/.ci/lint
index 2ee375f195..c9f4100a6b 100644
--- a/.ci/lint
+++ b/.ci/lint
@@ -98,7 +98,7 @@ pipeline {
         stage('linting all') {
             // perform a full linit if this is a merge forward and the change only lint passed.
             when {
-                expression { return params.CHANGE_BRANCH =~ /(?i)^merge[._-]/ }
+                expression { return env.CHANGE_BRANCH =~ /(?i)^merge[._-]/ }
             }
             parallel {
                 stage('setup full') {

From 45f363b152b1f4906d4e1d79f5ffd950c31f1075 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Thu, 20 Dec 2018 16:19:01 -0800
Subject: [PATCH 11/26] Fixing various lint errors.

---
 salt/daemons/test/__init__.py                        | 1 +
 salt/daemons/test/test_minion.py                     | 1 +
 salt/daemons/test/test_saltkeep.py                   | 1 +
 salt/engines/hipchat.py                              | 1 +
 salt/engines/logstash_engine.py                      | 1 +
 salt/engines/redis_sentinel.py                       | 1 +
 salt/log/setup.py                                    | 1 +
 salt/modules/capirca_acl.py                          | 1 +
 salt/modules/cron.py                                 | 1 +
 salt/modules/dig.py                                  | 1 +
 salt/modules/freebsdpkg.py                           | 2 ++
 salt/modules/git.py                                  | 1 +
 salt/modules/incron.py                               | 2 ++
 salt/modules/ipset.py                                | 1 +
 salt/modules/keystone.py                             | 1 +
 salt/modules/lxc.py                                  | 3 +++
 salt/modules/mac_brew.py                             | 1 +
 salt/modules/mac_ports.py                            | 1 +
 salt/modules/memcached.py                            | 2 ++
 salt/modules/network.py                              | 2 ++
 salt/modules/nspawn.py                               | 3 +++
 salt/modules/pacman.py                               | 1 +
 salt/modules/pillar.py                               | 1 +
 salt/modules/pkgng.py                                | 2 ++
 salt/modules/pkgutil.py                              | 1 +
 salt/modules/saltutil.py                             | 1 +
 salt/modules/solarisips.py                           | 1 +
 salt/modules/solarispkg.py                           | 1 +
 salt/modules/testinframod.py                         | 1 +
 salt/modules/win_file.py                             | 1 +
 salt/modules/win_network.py                          | 3 +++
 salt/modules/win_status.py                           | 1 +
 salt/modules/yumpkg.py                               | 4 ++++
 salt/modules/zenoss.py                               | 1 +
 salt/modules/zypper.py                               | 1 +
 salt/netapi/__init__.py                              | 1 +
 salt/netapi/rest_cherrypy/wsgi.py                    | 1 +
 salt/pillar/mongo.py                                 | 1 +
 salt/returners/highstate_return.py                   | 1 +
 salt/runners/state.py                                | 4 ++++
 salt/serializers/yaml.py                             | 1 +
 salt/serializers/yamlex.py                           | 1 +
 salt/states/module.py                                | 2 ++
 salt/states/stateconf.py                             | 1 +
 salt/states/virtualenv_mod.py                        | 1 +
 salt/states/win_system.py                            | 1 +
 salt/tops/mongo.py                                   | 1 +
 salt/utils/extend.py                                 | 1 +
 salt/utils/find.py                                   | 1 +
 salt/utils/schema.py                                 | 1 +
 salt/utils/yamlloader.py                             | 1 +
 tests/committer_parser.py                            | 1 +
 tests/integration/cloud/clouds/test_dimensiondata.py | 1 +
 tests/integration/cloud/clouds/test_ec2.py           | 2 --
 tests/integration/cloud/test_cloud.py                | 1 +
 tests/integration/modules/test_mac_user.py           | 1 +
 tests/jenkins.py                                     | 1 +
 tests/kitchen/test_kitchen.py                        | 1 +
 tests/minionswarm.py                                 | 1 +
 tests/salt-tcpdump.py                                | 1 +
 tests/support/copyartifacts.py                       | 1 +
 tests/support/runtests.py                            | 1 +
 tests/unit/modules/test_boto_cloudtrail.py           | 1 +
 tests/unit/modules/test_boto_s3_bucket.py            | 1 +
 tests/unit/modules/test_glusterfs.py                 | 1 +
 tests/unit/modules/test_mod_random.py                | 1 +
 tests/unit/modules/test_napalm_yang_mod.py           | 1 +
 tests/unit/modules/test_uptime.py                    | 1 +
 tests/unit/states/test_boto_cloudtrail.py            | 1 +
 tests/unit/states/test_boto_iot.py                   | 1 +
 tests/unit/states/test_boto_s3_bucket.py             | 1 +
 71 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/salt/daemons/test/__init__.py b/salt/daemons/test/__init__.py
index 9abffccfef..f98b8fd42f 100644
--- a/salt/daemons/test/__init__.py
+++ b/salt/daemons/test/__init__.py
@@ -41,5 +41,6 @@ def run(start=None):
     suite = loader.discover(start, 'test_*.py', top)
     unittest.TextTestRunner(verbosity=2).run(suite)
 
+
 if __name__ == "__main__":
     run()
diff --git a/salt/daemons/test/test_minion.py b/salt/daemons/test/test_minion.py
index ac7d5460b8..dbb48282c9 100644
--- a/salt/daemons/test/test_minion.py
+++ b/salt/daemons/test/test_minion.py
@@ -78,6 +78,7 @@ def test():
     minion = salt.daemons.flo.IofloMinion(opts=opts)
     minion.start(behaviors=['raet.flo.behaving'])
 
+
 if __name__ == '__main__':
     console.reinit(verbosity=console.Wordage.concise)
     test()
diff --git a/salt/daemons/test/test_saltkeep.py b/salt/daemons/test/test_saltkeep.py
index e548eed93e..9cf2dc0bfc 100644
--- a/salt/daemons/test/test_saltkeep.py
+++ b/salt/daemons/test/test_saltkeep.py
@@ -2224,6 +2224,7 @@ def runAll():
 
     unittest.TextTestRunner(verbosity=2).run(suite)
 
+
 if __name__ == '__main__' and __package__ is None:
 
     #console.reinit(verbosity=console.Wordage.concise)
diff --git a/salt/engines/hipchat.py b/salt/engines/hipchat.py
index c96fed6f43..753db04f31 100644
--- a/salt/engines/hipchat.py
+++ b/salt/engines/hipchat.py
@@ -63,6 +63,7 @@ from salt.ext import six
 def __virtual__():
     return HAS_HYPCHAT
 
+
 log = logging.getLogger(__name__)
 
 _DEFAULT_API_URL = 'https://api.hipchat.com'
diff --git a/salt/engines/logstash_engine.py b/salt/engines/logstash_engine.py
index 901a71d205..28f537f5e4 100644
--- a/salt/engines/logstash_engine.py
+++ b/salt/engines/logstash_engine.py
@@ -41,6 +41,7 @@ def __virtual__():
         if logstash is not None \
         else (False, 'python-logstash not installed')
 
+
 log = logging.getLogger(__name__)
 
 
diff --git a/salt/engines/redis_sentinel.py b/salt/engines/redis_sentinel.py
index e879ce0906..e197cb707a 100644
--- a/salt/engines/redis_sentinel.py
+++ b/salt/engines/redis_sentinel.py
@@ -48,6 +48,7 @@ def __virtual__():
     else:
         return True
 
+
 log = logging.getLogger(__name__)
 
 
diff --git a/salt/log/setup.py b/salt/log/setup.py
index 2710599d76..6ed30240c7 100644
--- a/salt/log/setup.py
+++ b/salt/log/setup.py
@@ -164,6 +164,7 @@ def is_mp_logging_configured():
 def is_extended_logging_configured():
     return __EXTERNAL_LOGGERS_CONFIGURED
 
+
 # Store a reference to the temporary queue logging handler
 LOGGING_NULL_HANDLER = __NullLoggingHandler(logging.WARNING)
 
diff --git a/salt/modules/capirca_acl.py b/salt/modules/capirca_acl.py
index 94889e87ac..bd3e25654b 100644
--- a/salt/modules/capirca_acl.py
+++ b/salt/modules/capirca_acl.py
@@ -64,6 +64,7 @@ def __virtual__():
     else:
         return (False, 'The capirca module (capirca_acl) cannot be loaded.')
 
+
 # ------------------------------------------------------------------------------
 # module globals
 # ------------------------------------------------------------------------------
diff --git a/salt/modules/cron.py b/salt/modules/cron.py
index d996a74a55..c184bde6de 100644
--- a/salt/modules/cron.py
+++ b/salt/modules/cron.py
@@ -704,6 +704,7 @@ def rm_job(user,
             return comdat['stderr']
     return ret
 
+
 rm = salt.utils.functools.alias_function(rm_job, 'rm')
 
 
diff --git a/salt/modules/dig.py b/salt/modules/dig.py
index 7dcae2ddad..31af50ed38 100644
--- a/salt/modules/dig.py
+++ b/salt/modules/dig.py
@@ -302,6 +302,7 @@ def TXT(host, nameserver=None):
 
     return [i for i in cmd['stdout'].split('\n')]
 
+
 # Let lowercase work, since that is the convention for Salt functions
 a = A
 aaaa = AAAA
diff --git a/salt/modules/freebsdpkg.py b/salt/modules/freebsdpkg.py
index e51a9359ad..43f127ef35 100644
--- a/salt/modules/freebsdpkg.py
+++ b/salt/modules/freebsdpkg.py
@@ -199,6 +199,7 @@ def latest_version(*names, **kwargs):
     '''
     return '' if len(names) == 1 else dict((x, '') for x in names)
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
@@ -485,6 +486,7 @@ def remove(name=None, pkgs=None, **kwargs):
 
     return ret
 
+
 # Support pkg.delete to remove packages to more closely match pkg_delete
 delete = salt.utils.functools.alias_function(remove, 'delete')
 # No equivalent to purge packages, use remove instead
diff --git a/salt/modules/git.py b/salt/modules/git.py
index 63d57f75b9..6bec20f8d5 100644
--- a/salt/modules/git.py
+++ b/salt/modules/git.py
@@ -1372,6 +1372,7 @@ def config_get_regexp(key,
         ret.setdefault(param, []).append(value)
     return ret
 
+
 config_get_regex = salt.utils.functools.alias_function(config_get_regexp, 'config_get_regex')
 
 
diff --git a/salt/modules/incron.py b/salt/modules/incron.py
index 7950f1db64..b5a2dfeb6d 100644
--- a/salt/modules/incron.py
+++ b/salt/modules/incron.py
@@ -212,6 +212,7 @@ def list_tab(user):
             ret['pre'].append(line)
     return ret
 
+
 # For consistency's sake
 ls = salt.utils.functools.alias_function(list_tab, 'ls')
 
@@ -317,4 +318,5 @@ def rm_job(user,
 
     return ret
 
+
 rm = salt.utils.functools.alias_function(rm_job, 'rm')
diff --git a/salt/modules/ipset.py b/salt/modules/ipset.py
index 1a0fa0044d..8d3a33b6d5 100644
--- a/salt/modules/ipset.py
+++ b/salt/modules/ipset.py
@@ -26,6 +26,7 @@ def long_range(start, end):
         yield start
         start += 1
 
+
 _IPSET_FAMILIES = {
         'ipv4': 'inet',
         'ip4': 'inet',
diff --git a/salt/modules/keystone.py b/salt/modules/keystone.py
index 0f71233433..2f39da5a63 100644
--- a/salt/modules/keystone.py
+++ b/salt/modules/keystone.py
@@ -87,6 +87,7 @@ def __virtual__():
         return 'keystone'
     return (False, 'keystone execution module cannot be loaded: keystoneclient python library not available.')
 
+
 __opts__ = {}
 
 
diff --git a/salt/modules/lxc.py b/salt/modules/lxc.py
index 7e6ee984ce..e64811c08e 100644
--- a/salt/modules/lxc.py
+++ b/salt/modules/lxc.py
@@ -2599,6 +2599,7 @@ def destroy(name, stop=False, path=None):
         )
     return _change_state('lxc-destroy', name, None, path=path)
 
+
 # Compatibility between LXC and nspawn
 remove = salt.utils.functools.alias_function(destroy, 'remove')
 
@@ -2943,6 +2944,7 @@ def set_password(name, users, password, encrypted=True, path=None):
         )
     return True
 
+
 set_pass = salt.utils.functools.alias_function(set_password, 'set_pass')
 
 
@@ -4209,6 +4211,7 @@ def copy_to(name, source, dest, overwrite=False, makedirs=False, path=None):
         overwrite=overwrite,
         makedirs=makedirs)
 
+
 cp = salt.utils.functools.alias_function(copy_to, 'cp')
 
 
diff --git a/salt/modules/mac_brew.py b/salt/modules/mac_brew.py
index 7dcaf9c633..b95b2dab73 100644
--- a/salt/modules/mac_brew.py
+++ b/salt/modules/mac_brew.py
@@ -189,6 +189,7 @@ def latest_version(*names, **kwargs):
     else:
         return versions_dict
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
diff --git a/salt/modules/mac_ports.py b/salt/modules/mac_ports.py
index 9dafc5caa9..78a38d54a9 100644
--- a/salt/modules/mac_ports.py
+++ b/salt/modules/mac_ports.py
@@ -179,6 +179,7 @@ def latest_version(*names, **kwargs):
 
     return ret
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
diff --git a/salt/modules/memcached.py b/salt/modules/memcached.py
index 06cde0da6e..11fea04acc 100644
--- a/salt/modules/memcached.py
+++ b/salt/modules/memcached.py
@@ -238,6 +238,7 @@ def increment(key, delta=1, host=DEFAULT_HOST, port=DEFAULT_PORT):
     except ValueError:
         raise SaltInvocationError('Delta value must be an integer')
 
+
 incr = salt.utils.functools.alias_function(increment, 'incr')
 
 
@@ -269,4 +270,5 @@ def decrement(key, delta=1, host=DEFAULT_HOST, port=DEFAULT_PORT):
     except ValueError:
         raise SaltInvocationError('Delta value must be an integer')
 
+
 decr = salt.utils.functools.alias_function(decrement, 'decr')
diff --git a/salt/modules/network.py b/salt/modules/network.py
index 360986e0f5..12105e84a2 100644
--- a/salt/modules/network.py
+++ b/salt/modules/network.py
@@ -1035,6 +1035,7 @@ def hw_addr(iface):
     '''
     return salt.utils.network.hw_addr(iface)
 
+
 # Alias hwaddr to preserve backward compat
 hwaddr = salt.utils.functools.alias_function(hw_addr, 'hwaddr')
 
@@ -1213,6 +1214,7 @@ def ip_addrs6(interface=None, include_loopback=False, cidr=None):
     else:
         return addrs
 
+
 ipaddrs6 = salt.utils.functools.alias_function(ip_addrs6, 'ipaddrs6')
 
 
diff --git a/salt/modules/nspawn.py b/salt/modules/nspawn.py
index 51186523fd..7f3d11ab9f 100644
--- a/salt/modules/nspawn.py
+++ b/salt/modules/nspawn.py
@@ -882,6 +882,7 @@ def list_running():
             pass
     return sorted(ret)
 
+
 # 'machinectl list' shows only running containers, so allow this to work as an
 # alias to nspawn.list_running
 list_ = salt.utils.functools.alias_function(list_running, 'list_')
@@ -1313,6 +1314,7 @@ def copy_to(name, source, dest, overwrite=False, makedirs=False):
         overwrite=overwrite,
         makedirs=makedirs)
 
+
 cp = salt.utils.functools.alias_function(copy_to, 'cp')
 
 
@@ -1478,4 +1480,5 @@ def pull_dkr(url, name, index):
     '''
     return _pull_image('dkr', url, name, index=index)
 
+
 pull_docker = salt.utils.functools.alias_function(pull_dkr, 'pull_docker')
diff --git a/salt/modules/pacman.py b/salt/modules/pacman.py
index a38a132f46..e30296e8c8 100644
--- a/salt/modules/pacman.py
+++ b/salt/modules/pacman.py
@@ -106,6 +106,7 @@ def latest_version(*names, **kwargs):
         return ret[names[0]]
     return ret
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
diff --git a/salt/modules/pillar.py b/salt/modules/pillar.py
index c85669d645..c4151b0b60 100644
--- a/salt/modules/pillar.py
+++ b/salt/modules/pillar.py
@@ -277,6 +277,7 @@ def items(*args, **kwargs):
 
     return pillar.compile_pillar()
 
+
 # Allow pillar.data to also be used to return pillar data
 data = salt.utils.functools.alias_function(items, 'data')
 
diff --git a/salt/modules/pkgng.py b/salt/modules/pkgng.py
index 765401d80d..503c7e39fd 100644
--- a/salt/modules/pkgng.py
+++ b/salt/modules/pkgng.py
@@ -218,6 +218,7 @@ def version(*names, **kwargs):
         for x, y in six.iteritems(ret)
     ])
 
+
 # Support pkg.info get version info, since this is the CLI usage
 info = salt.utils.functools.alias_function(version, 'info')
 
@@ -1080,6 +1081,7 @@ def remove(name=None,
 
     return ret
 
+
 # Support pkg.delete to remove packages, since this is the CLI usage
 delete = salt.utils.functools.alias_function(remove, 'delete')
 # No equivalent to purge packages, use remove instead
diff --git a/salt/modules/pkgutil.py b/salt/modules/pkgutil.py
index aef7d46a67..510feaa146 100644
--- a/salt/modules/pkgutil.py
+++ b/salt/modules/pkgutil.py
@@ -240,6 +240,7 @@ def latest_version(*names, **kwargs):
         return ret[names[0]]
     return ret
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py
index 2c152e3ff1..daf2f5142b 100644
--- a/salt/modules/saltutil.py
+++ b/salt/modules/saltutil.py
@@ -660,6 +660,7 @@ def sync_output(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl
         refresh_modules()
     return ret
 
+
 sync_outputters = salt.utils.functools.alias_function(sync_output, 'sync_outputters')
 
 
diff --git a/salt/modules/solarisips.py b/salt/modules/solarisips.py
index e907895905..30016ecf93 100644
--- a/salt/modules/solarisips.py
+++ b/salt/modules/solarisips.py
@@ -332,6 +332,7 @@ def latest_version(name, **kwargs):
         return ret
     return ''
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
diff --git a/salt/modules/solarispkg.py b/salt/modules/solarispkg.py
index 6908db4c39..2a828f6e9c 100644
--- a/salt/modules/solarispkg.py
+++ b/salt/modules/solarispkg.py
@@ -164,6 +164,7 @@ def latest_version(*names, **kwargs):
         return ret[names[0]]
     return ret
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
diff --git a/salt/modules/testinframod.py b/salt/modules/testinframod.py
index 9a81a372d0..da91217873 100644
--- a/salt/modules/testinframod.py
+++ b/salt/modules/testinframod.py
@@ -307,5 +307,6 @@ def _register_functions():
         __all__.append(mod_name)
         globals()[mod_name] = mod_func
 
+
 if TESTINFRA_PRESENT:
     _register_functions()
diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py
index bf82f47473..6a03ee325a 100644
--- a/salt/modules/win_file.py
+++ b/salt/modules/win_file.py
@@ -198,6 +198,7 @@ def __virtual__():
 
     return __virtualname__
 
+
 __outputter__ = {
     'touch': 'txt',
     'append': 'txt',
diff --git a/salt/modules/win_network.py b/salt/modules/win_network.py
index 40e68d22a3..449d4f746c 100644
--- a/salt/modules/win_network.py
+++ b/salt/modules/win_network.py
@@ -314,6 +314,7 @@ def hw_addr(iface):
     '''
     return salt.utils.network.hw_addr(iface)
 
+
 # Alias hwaddr to preserve backward compat
 hwaddr = salt.utils.functools.alias_function(hw_addr, 'hwaddr')
 
@@ -359,6 +360,7 @@ def ip_addrs(interface=None, include_loopback=False):
     return salt.utils.network.ip_addrs(interface=interface,
                                        include_loopback=include_loopback)
 
+
 ipaddrs = salt.utils.functools.alias_function(ip_addrs, 'ipaddrs')
 
 
@@ -377,6 +379,7 @@ def ip_addrs6(interface=None, include_loopback=False):
     return salt.utils.network.ip_addrs6(interface=interface,
                                         include_loopback=include_loopback)
 
+
 ipaddrs6 = salt.utils.functools.alias_function(ip_addrs6, 'ipaddrs6')
 
 
diff --git a/salt/modules/win_status.py b/salt/modules/win_status.py
index 0dc7816846..1df8529018 100644
--- a/salt/modules/win_status.py
+++ b/salt/modules/win_status.py
@@ -72,6 +72,7 @@ def __virtual__():
 
     return __virtualname__
 
+
 __func_alias__ = {
     'time_': 'time'
 }
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
index 9ee4d80c49..43e2d12b9a 100644
--- a/salt/modules/yumpkg.py
+++ b/salt/modules/yumpkg.py
@@ -531,6 +531,7 @@ def latest_version(*names, **kwargs):
         return ret[names[0]]
     return ret
 
+
 # available_version is being deprecated
 available_version = salt.utils.functools.alias_function(latest_version, 'available_version')
 
@@ -962,6 +963,7 @@ def list_upgrades(refresh=True, **kwargs):
 
     return dict([(x.name, x.version) for x in _yum_pkginfo(out['stdout'])])
 
+
 # Preserve expected CLI usage (yum list updates)
 list_updates = salt.utils.functools.alias_function(list_upgrades, 'list_updates')
 
@@ -2240,6 +2242,7 @@ def list_holds(pattern=__HOLD_PATTERN, full=True):
             ret.append(match)
     return ret
 
+
 get_locked_packages = salt.utils.functools.alias_function(list_holds, 'get_locked_packages')
 
 
@@ -2547,6 +2550,7 @@ def group_install(name,
 
     return install(pkgs=pkgs, **kwargs)
 
+
 groupinstall = salt.utils.functools.alias_function(group_install, 'groupinstall')
 
 
diff --git a/salt/modules/zenoss.py b/salt/modules/zenoss.py
index bca710faea..50711f34cd 100644
--- a/salt/modules/zenoss.py
+++ b/salt/modules/zenoss.py
@@ -51,6 +51,7 @@ def __virtual__():
         return False, 'The \'{0}\' module could not be loaded: ' \
                       '\'requests\' is not installed.'.format(__virtualname__)
 
+
 ROUTERS = {'MessagingRouter': 'messaging',
            'EventsRouter': 'evconsole',
            'ProcessRouter': 'process',
diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
index d901326754..0dd7b9deef 100644
--- a/salt/modules/zypper.py
+++ b/salt/modules/zypper.py
@@ -469,6 +469,7 @@ def list_upgrades(refresh=True, **kwargs):
 
     return ret
 
+
 # Provide a list_updates function for those used to using zypper list-updates
 list_updates = salt.utils.functools.alias_function(list_upgrades, 'list_updates')
 
diff --git a/salt/netapi/__init__.py b/salt/netapi/__init__.py
index 0c080df72a..ce7003005a 100644
--- a/salt/netapi/__init__.py
+++ b/salt/netapi/__init__.py
@@ -199,6 +199,7 @@ class NetapiClient(object):
         wheel = salt.wheel.WheelClient(self.opts)
         return wheel.cmd_async(kwargs)
 
+
 CLIENTS = [
     name for name, _
     in inspect.getmembers(NetapiClient, predicate=inspect.ismethod if six.PY2 else None)
diff --git a/salt/netapi/rest_cherrypy/wsgi.py b/salt/netapi/rest_cherrypy/wsgi.py
index fec3609c60..799f1ed0b5 100644
--- a/salt/netapi/rest_cherrypy/wsgi.py
+++ b/salt/netapi/rest_cherrypy/wsgi.py
@@ -81,4 +81,5 @@ def get_application(*args):
 
     return wsgi_app
 
+
 application = get_application()
diff --git a/salt/pillar/mongo.py b/salt/pillar/mongo.py
index 577308cbe9..9d07c773c4 100644
--- a/salt/pillar/mongo.py
+++ b/salt/pillar/mongo.py
@@ -81,6 +81,7 @@ def __virtual__():
         return False
     return 'mongo'
 
+
 # Set up logging
 log = logging.getLogger(__name__)
 
diff --git a/salt/returners/highstate_return.py b/salt/returners/highstate_return.py
index 54e501b079..c13f51655c 100644
--- a/salt/returners/highstate_return.py
+++ b/salt/returners/highstate_return.py
@@ -135,6 +135,7 @@ def _get_options(ret):
 
     return _options
 
+
 #
 # Most email readers to not support <style> tag.
 # The following dict and a function provide a primitive styler
diff --git a/salt/runners/state.py b/salt/runners/state.py
index 2e3d70508c..573bc666f4 100644
--- a/salt/runners/state.py
+++ b/salt/runners/state.py
@@ -25,6 +25,7 @@ def pause(jid, state_id=None, duration=None):
     minion = salt.minion.MasterMinion(__opts__)
     minion.functions['state.pause'](jid, state_id, duration)
 
+
 set_pause = salt.utils.functools.alias_function(pause, 'set_pause')
 
 
@@ -35,6 +36,7 @@ def resume(jid, state_id=None):
     minion = salt.minion.MasterMinion(__opts__)
     minion.functions['state.resume'](jid, state_id)
 
+
 rm_pause = salt.utils.functools.alias_function(resume, 'rm_pause')
 
 
@@ -132,6 +134,7 @@ def orchestrate(mods,
         ret['retcode'] = 1
     return ret
 
+
 # Aliases for orchestrate runner
 orch = salt.utils.functools.alias_function(orchestrate, 'orch')
 sls = salt.utils.functools.alias_function(orchestrate, 'sls')
@@ -241,6 +244,7 @@ def orchestrate_show_sls(mods,
     ret = {minion.opts['id']: running}
     return ret
 
+
 orch_show_sls = salt.utils.functools.alias_function(orchestrate_show_sls, 'orch_show_sls')
 
 
diff --git a/salt/serializers/yaml.py b/salt/serializers/yaml.py
index 864c1546d6..c95b40e48f 100644
--- a/salt/serializers/yaml.py
+++ b/salt/serializers/yaml.py
@@ -121,6 +121,7 @@ class Dumper(BaseDumper):  # pylint: disable=W0232
     '''Overwrites Dumper as not for pollute legacy Dumper'''
     pass
 
+
 Dumper.add_multi_representer(EncryptedString, EncryptedString.yaml_dumper)
 Dumper.add_multi_representer(type(None), Dumper.represent_none)
 Dumper.add_multi_representer(str, Dumper.represent_str)
diff --git a/salt/serializers/yamlex.py b/salt/serializers/yamlex.py
index 54149a47d9..08edba2bb8 100644
--- a/salt/serializers/yamlex.py
+++ b/salt/serializers/yamlex.py
@@ -389,6 +389,7 @@ class Dumper(BaseDumper):  # pylint: disable=W0232
     def represent_odict(self, data):
         return self.represent_mapping('tag:yaml.org,2002:map', list(data.items()))
 
+
 Dumper.add_multi_representer(type(None), Dumper.represent_none)
 if six.PY2:
     Dumper.add_multi_representer(six.binary_type, Dumper.represent_str)
diff --git a/salt/states/module.py b/salt/states/module.py
index 2190ffa3d2..9968529ffd 100644
--- a/salt/states/module.py
+++ b/salt/states/module.py
@@ -213,6 +213,7 @@ def wait(name, **kwargs):
             'result': True,
             'comment': ''}
 
+
 # Alias module.watch to module.wait
 watch = salt.utils.functools.alias_function(wait, 'watch')
 
@@ -552,4 +553,5 @@ def _get_dict_result(node):
                 break
     return ret
 
+
 mod_watch = salt.utils.functools.alias_function(run, 'mod_watch')
diff --git a/salt/states/stateconf.py b/salt/states/stateconf.py
index 7452ceacaa..80ebcf085b 100644
--- a/salt/states/stateconf.py
+++ b/salt/states/stateconf.py
@@ -16,4 +16,5 @@ def _no_op(name, **kwargs):
     '''
     return dict(name=name, result=True, changes={}, comment='')
 
+
 set = context = _no_op  # pylint: disable=C0103
diff --git a/salt/states/virtualenv_mod.py b/salt/states/virtualenv_mod.py
index 79b6e8914f..af401a55c1 100644
--- a/salt/states/virtualenv_mod.py
+++ b/salt/states/virtualenv_mod.py
@@ -343,4 +343,5 @@ def managed(name,
                 'old': old if old else ''}
     return ret
 
+
 manage = salt.utils.functools.alias_function(managed, 'manage')
diff --git a/salt/states/win_system.py b/salt/states/win_system.py
index d019612d55..45d87ad8cd 100644
--- a/salt/states/win_system.py
+++ b/salt/states/win_system.py
@@ -81,6 +81,7 @@ def computer_desc(name):
                           '\'{0}\''.format(name))
     return ret
 
+
 computer_description = salt.utils.functools.alias_function(computer_desc, 'computer_description')
 
 
diff --git a/salt/tops/mongo.py b/salt/tops/mongo.py
index 54324ca61d..461a098ae7 100644
--- a/salt/tops/mongo.py
+++ b/salt/tops/mongo.py
@@ -67,6 +67,7 @@ def __virtual__():
         return False
     return 'mongo'
 
+
 # Set up logging
 log = logging.getLogger(__name__)
 
diff --git a/salt/utils/extend.py b/salt/utils/extend.py
index cb12cc4973..506dabd120 100644
--- a/salt/utils/extend.py
+++ b/salt/utils/extend.py
@@ -303,5 +303,6 @@ def run(extension=None, name=None, description=None, salt_dir=None, merge=False,
     log.info('New module stored in %s', path)
     return path
 
+
 if __name__ == '__main__':
     run()
diff --git a/salt/utils/find.py b/salt/utils/find.py
index feb7b28e8d..d517cba69d 100644
--- a/salt/utils/find.py
+++ b/salt/utils/find.py
@@ -723,5 +723,6 @@ def _main():
     for result in finder.find(path):
         print(result)
 
+
 if __name__ == '__main__':
     _main()
diff --git a/salt/utils/schema.py b/salt/utils/schema.py
index e55285309a..f72084785a 100644
--- a/salt/utils/schema.py
+++ b/salt/utils/schema.py
@@ -403,6 +403,7 @@ of a field to null.
 def _failing_new(*args, **kwargs):
     raise TypeError('Can\'t create another NullSentinel instance')
 
+
 NullSentinel.__new__ = staticmethod(_failing_new)
 del _failing_new
 
diff --git a/salt/utils/yamlloader.py b/salt/utils/yamlloader.py
index 66f267c039..8282c04dde 100644
--- a/salt/utils/yamlloader.py
+++ b/salt/utils/yamlloader.py
@@ -27,6 +27,7 @@ class DuplicateKeyWarning(RuntimeWarning):
     Warned when duplicate keys exist
     '''
 
+
 warnings.simplefilter('always', category=DuplicateKeyWarning)
 
 
diff --git a/tests/committer_parser.py b/tests/committer_parser.py
index ec722aa60e..1a7fbbd36f 100644
--- a/tests/committer_parser.py
+++ b/tests/committer_parser.py
@@ -158,5 +158,6 @@ def main(argv=None):
     else:
         print(count_results(data, counts))
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/tests/integration/cloud/clouds/test_dimensiondata.py b/tests/integration/cloud/clouds/test_dimensiondata.py
index 504c34cb4e..b2834f21d4 100644
--- a/tests/integration/cloud/clouds/test_dimensiondata.py
+++ b/tests/integration/cloud/clouds/test_dimensiondata.py
@@ -28,6 +28,7 @@ def _random_name(size=6):
         for x in range(size)
     )
 
+
 # Create the cloud instance name to be used throughout the tests
 INSTANCE_NAME = _random_name()
 PROVIDER_NAME = 'dimensiondata'
diff --git a/tests/integration/cloud/clouds/test_ec2.py b/tests/integration/cloud/clouds/test_ec2.py
index 7c047b7ce9..60550b0279 100644
--- a/tests/integration/cloud/clouds/test_ec2.py
+++ b/tests/integration/cloud/clouds/test_ec2.py
@@ -33,8 +33,6 @@ class EC2Test(ShellCase):
     '''
     Integration tests for the EC2 cloud provider in Salt-Cloud
     '''
-
-
     def _installer_name(self):
         '''
         Determine the downloaded installer name by searching the files
diff --git a/tests/integration/cloud/test_cloud.py b/tests/integration/cloud/test_cloud.py
index 756dadeee7..9b2300b99e 100644
--- a/tests/integration/cloud/test_cloud.py
+++ b/tests/integration/cloud/test_cloud.py
@@ -28,6 +28,7 @@ def __random_name(size=6):
         for x in range(size)
     )
 
+
 # Create the cloud instance name to be used throughout the tests
 INSTANCE_NAME = __random_name()
 
diff --git a/tests/integration/modules/test_mac_user.py b/tests/integration/modules/test_mac_user.py
index dbf6ae4642..cdd3e16380 100644
--- a/tests/integration/modules/test_mac_user.py
+++ b/tests/integration/modules/test_mac_user.py
@@ -32,6 +32,7 @@ def __random_string(size=6):
         for x in range(size)
     )
 
+
 # Create user strings for tests
 ADD_USER = __random_string()
 DEL_USER = __random_string()
diff --git a/tests/jenkins.py b/tests/jenkins.py
index 9ca0cf840c..ed2dd80e09 100644
--- a/tests/jenkins.py
+++ b/tests/jenkins.py
@@ -1001,6 +1001,7 @@ def parse():
 
     return options
 
+
 if __name__ == '__main__':
     exit_code = run(parse())
     print('Exit Code: {0}'.format(exit_code))
diff --git a/tests/kitchen/test_kitchen.py b/tests/kitchen/test_kitchen.py
index 2cae399be0..013d9e403e 100644
--- a/tests/kitchen/test_kitchen.py
+++ b/tests/kitchen/test_kitchen.py
@@ -79,5 +79,6 @@ def func_builder(testdir):
         )
     return func
 
+
 for testdir in os.listdir(os.path.join(CURRENT_DIR, 'tests')):
     setattr(KitchenTestCase, 'test_kitchen_{0}'.format(testdir), func_builder(testdir))
diff --git a/tests/minionswarm.py b/tests/minionswarm.py
index edbf7d41f8..1a8e8ac106 100644
--- a/tests/minionswarm.py
+++ b/tests/minionswarm.py
@@ -434,6 +434,7 @@ class MasterSwarm(Swarm):
         )
         print('Master killed')
 
+
 # pylint: disable=C0103
 if __name__ == '__main__':
     swarm = Swarm(parse())
diff --git a/tests/salt-tcpdump.py b/tests/salt-tcpdump.py
index b7472d1b0f..7da9b8fcb9 100644
--- a/tests/salt-tcpdump.py
+++ b/tests/salt-tcpdump.py
@@ -442,5 +442,6 @@ def main():
     except KeyboardInterrupt:
         sys.exit(1)
 
+
 if __name__ == "__main__":
     main()
diff --git a/tests/support/copyartifacts.py b/tests/support/copyartifacts.py
index b4ad705797..31533a48d9 100644
--- a/tests/support/copyartifacts.py
+++ b/tests/support/copyartifacts.py
@@ -60,6 +60,7 @@ class DownloadArtifacts(object):
         except IOError:
             print('Failed to copy: {0}'.format(remote))
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Jenkins Artifact Download Helper')
     parser.add_argument(
diff --git a/tests/support/runtests.py b/tests/support/runtests.py
index 2cc2139f6c..5c3e6632a4 100644
--- a/tests/support/runtests.py
+++ b/tests/support/runtests.py
@@ -184,6 +184,7 @@ class RuntimeVars(object):
             object.__setattr__(self, name, value)
             return
         self._vars[name] = value
+
 # <---- Helper Methods -----------------------------------------------------------------------------------------------
 
 # ----- Global Variables -------------------------------------------------------------------------------------------->
diff --git a/tests/unit/modules/test_boto_cloudtrail.py b/tests/unit/modules/test_boto_cloudtrail.py
index 4f61bba4d7..b01ed59de2 100644
--- a/tests/unit/modules/test_boto_cloudtrail.py
+++ b/tests/unit/modules/test_boto_cloudtrail.py
@@ -55,6 +55,7 @@ def _has_required_boto():
     else:
         return True
 
+
 if _has_required_boto():
     region = 'us-east-1'
     access_key = 'GKTADJGHEIQSXMKKRBJ08H'
diff --git a/tests/unit/modules/test_boto_s3_bucket.py b/tests/unit/modules/test_boto_s3_bucket.py
index d184f656a1..ab3d85c547 100644
--- a/tests/unit/modules/test_boto_s3_bucket.py
+++ b/tests/unit/modules/test_boto_s3_bucket.py
@@ -57,6 +57,7 @@ def _has_required_boto():
     else:
         return True
 
+
 if _has_required_boto():
     region = 'us-east-1'
     access_key = 'GKTADJGHEIQSXMKKRBJ08H'
diff --git a/tests/unit/modules/test_glusterfs.py b/tests/unit/modules/test_glusterfs.py
index 27b44a8ff8..ccaa395994 100644
--- a/tests/unit/modules/test_glusterfs.py
+++ b/tests/unit/modules/test_glusterfs.py
@@ -181,6 +181,7 @@ class GlusterResults(object):
             success_first_ip_from_second_second_time = success_reverse_already_peer[
                 'ip']
 
+
 xml_peer_present = """
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <cliOutput>
diff --git a/tests/unit/modules/test_mod_random.py b/tests/unit/modules/test_mod_random.py
index 6e5c05a0a6..88be09a766 100644
--- a/tests/unit/modules/test_mod_random.py
+++ b/tests/unit/modules/test_mod_random.py
@@ -40,6 +40,7 @@ def _test_hashlib():
     else:
         return True
 
+
 SUPPORTED_HASHLIB = _test_hashlib()
 
 
diff --git a/tests/unit/modules/test_napalm_yang_mod.py b/tests/unit/modules/test_napalm_yang_mod.py
index 1ce47e1f8a..e2af6882d8 100644
--- a/tests/unit/modules/test_napalm_yang_mod.py
+++ b/tests/unit/modules/test_napalm_yang_mod.py
@@ -44,6 +44,7 @@ class MockNapalmYangModule(object):
     models = MockNapalmYangModels()
     utils = MockUtils()
 
+
 TEST_CONFIG = {
     'comment': 'Configuration discarded.',
     'already_configured': False,
diff --git a/tests/unit/modules/test_uptime.py b/tests/unit/modules/test_uptime.py
index ed0a9fe47f..daced37315 100644
--- a/tests/unit/modules/test_uptime.py
+++ b/tests/unit/modules/test_uptime.py
@@ -46,6 +46,7 @@ class RequestPutResponseMock(Mock):
     def json(self):
         return {'_id': 4321}
 
+
 REQUEST_MOCK = RequestMock()
 
 
diff --git a/tests/unit/states/test_boto_cloudtrail.py b/tests/unit/states/test_boto_cloudtrail.py
index cb5fb4ca36..f9fcbf0f63 100644
--- a/tests/unit/states/test_boto_cloudtrail.py
+++ b/tests/unit/states/test_boto_cloudtrail.py
@@ -60,6 +60,7 @@ def _has_required_boto():
     else:
         return True
 
+
 if _has_required_boto():
     region = 'us-east-1'
     access_key = 'GKTADJGHEIQSXMKKRBJ08H'
diff --git a/tests/unit/states/test_boto_iot.py b/tests/unit/states/test_boto_iot.py
index f88bdf7f26..530d88c464 100644
--- a/tests/unit/states/test_boto_iot.py
+++ b/tests/unit/states/test_boto_iot.py
@@ -58,6 +58,7 @@ def _has_required_boto():
     else:
         return True
 
+
 if _has_required_boto():
     region = 'us-east-1'
     access_key = 'GKTADJGHEIQSXMKKRBJ08H'
diff --git a/tests/unit/states/test_boto_s3_bucket.py b/tests/unit/states/test_boto_s3_bucket.py
index 16ae9fb0f0..0d3e494b4b 100644
--- a/tests/unit/states/test_boto_s3_bucket.py
+++ b/tests/unit/states/test_boto_s3_bucket.py
@@ -53,6 +53,7 @@ def _has_required_boto():
     else:
         return True
 
+
 if _has_required_boto():
     region = 'us-east-1'
     access_key = 'GKTADJGHEIQSXMKKRBJ08H'

From f44a87ee66a3af49f605a47f5e05de65e32a503a Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Thu, 20 Dec 2018 16:40:32 -0800
Subject: [PATCH 12/26] One last lint fix.

---
 tests/support/runtests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/support/runtests.py b/tests/support/runtests.py
index 5c3e6632a4..6a83e3abcc 100644
--- a/tests/support/runtests.py
+++ b/tests/support/runtests.py
@@ -185,6 +185,7 @@ class RuntimeVars(object):
             return
         self._vars[name] = value
 
+
 # <---- Helper Methods -----------------------------------------------------------------------------------------------
 
 # ----- Global Variables -------------------------------------------------------------------------------------------->

From cdc7825f56ba782e80be80d80527a3cbd96dd70a Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Thu, 20 Dec 2018 17:26:47 -0800
Subject: [PATCH 13/26] yet another lint fix.

---
 tests/unit/states/test_boto_elasticsearch_domain.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/states/test_boto_elasticsearch_domain.py b/tests/unit/states/test_boto_elasticsearch_domain.py
index 9084ddda54..e6664ab667 100644
--- a/tests/unit/states/test_boto_elasticsearch_domain.py
+++ b/tests/unit/states/test_boto_elasticsearch_domain.py
@@ -54,6 +54,7 @@ def _has_required_boto():
     else:
         return True
 
+
 if _has_required_boto():
     region = 'us-east-1'
     access_key = 'GKTADJGHEIQSXMKKRBJ08H'

From df8d7b9d05da6f641c401c4f7bc96e8c9098f6cb Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
Date: Fri, 21 Dec 2018 11:21:58 +0100
Subject: [PATCH 14/26] Fix twilio version checking

twilio.__version__ is a string and twilio.__version_info__ is a tuple of
strings containing integers [e.g. ('6', '8', '2')]. The
test_twilio_notify unittest fails:

```
ERROR: unit.modules.test_twilio_notify (unittest.loader._FailedTest)
----------------------------------------------------------------------
ImportError: Failed to import test module: unit.modules.test_twilio_notify
Traceback (most recent call last):
  File "/usr/lib/python3.7/unittest/loader.py", line 434, in _find_test_path
    module = self._get_module_from_name(name)
  File "/usr/lib/python3.7/unittest/loader.py", line 375, in _get_module_from_name
    __import__(name)
  File "tests/unit/modules/test_twilio_notify.py", line 20, in <module>
    import salt.modules.twilio_notify as twilio_notify
  File "salt/modules/twilio_notify.py", line 28, in <module>
    if twilio.__version__ > 5:
TypeError: '>' not supported between instances of 'str' and 'int'
```

Fix the twilio version check to use __version_info__ and converting its
elements to int.
---
 salt/modules/twilio_notify.py            | 4 +++-
 tests/unit/modules/test_twilio_notify.py | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/salt/modules/twilio_notify.py b/salt/modules/twilio_notify.py
index 106d04a45e..dfdb512580 100644
--- a/salt/modules/twilio_notify.py
+++ b/salt/modules/twilio_notify.py
@@ -25,7 +25,9 @@ from salt.ext import six
 HAS_LIBS = False
 try:
     import twilio
-    if twilio.__version__ > 5:
+    # Grab version, ensure elements are ints
+    twilio_version = tuple([int(x) for x in twilio.__version_info__])
+    if twilio_version > (5, ):
         TWILIO_5 = False
         from twilio.rest import Client as TwilioRestClient
         from twilio.rest import TwilioException as TwilioRestException
diff --git a/tests/unit/modules/test_twilio_notify.py b/tests/unit/modules/test_twilio_notify.py
index c8c2f9fafc..d1cbfceca1 100644
--- a/tests/unit/modules/test_twilio_notify.py
+++ b/tests/unit/modules/test_twilio_notify.py
@@ -22,7 +22,9 @@ import salt.modules.twilio_notify as twilio_notify
 HAS_LIBS = False
 try:
     import twilio
-    if twilio.__version__ > 5:
+    # Grab version, ensure elements are ints
+    twilio_version = tuple([int(x) for x in twilio.__version_info__])
+    if twilio_version > (5, ):
         TWILIO_5 = False
     else:
         TWILIO_5 = True

From f3b12547a270bf8aab16b6cdae258aaeb589e7ee Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Fri, 21 Dec 2018 10:14:35 -0600
Subject: [PATCH 15/26] Remove redundant overrides for ip_address/ip_interface

These cause spurious logging when there are IPv6 interfaces present.
Furthermore, these functions are both a) present in PY3's ipaddress
module, and b) present in the backported ipaddress module used in Salt
when the machine is running PY2.
---
 salt/_compat.py | 74 -------------------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/salt/_compat.py b/salt/_compat.py
index 0576210afc..8d38f38230 100644
--- a/salt/_compat.py
+++ b/salt/_compat.py
@@ -230,81 +230,7 @@ class IPv6InterfaceScoped(ipaddress.IPv6Interface, IPv6AddressScoped):
         self.hostmask = self.network.hostmask
 
 
-def ip_address(address):
-    """Take an IP string/int and return an object of the correct type.
-
-    Args:
-        address: A string or integer, the IP address.  Either IPv4 or
-          IPv6 addresses may be supplied; integers less than 2**32 will
-          be considered to be IPv4 by default.
-
-    Returns:
-        An IPv4Address or IPv6Address object.
-
-    Raises:
-        ValueError: if the *address* passed isn't either a v4 or a v6
-          address
-
-    """
-    try:
-        return ipaddress.IPv4Address(address)
-    except (ipaddress.AddressValueError, ipaddress.NetmaskValueError) as err:
-        log.debug('Error while parsing IPv4 address: %s', address)
-        log.debug(err)
-
-    try:
-        return IPv6AddressScoped(address)
-    except (ipaddress.AddressValueError, ipaddress.NetmaskValueError) as err:
-        log.debug('Error while parsing IPv6 address: %s', address)
-        log.debug(err)
-
-    if isinstance(address, bytes):
-        raise ipaddress.AddressValueError('{} does not appear to be an IPv4 or IPv6 address. '
-                                          'Did you pass in a bytes (str in Python 2) instead '
-                                          'of a unicode object?'.format(repr(address)))
-
-    raise ValueError('{} does not appear to be an IPv4 or IPv6 address'.format(repr(address)))
-
-
-def ip_interface(address):
-    """Take an IP string/int and return an object of the correct type.
-
-    Args:
-        address: A string or integer, the IP address.  Either IPv4 or
-          IPv6 addresses may be supplied; integers less than 2**32 will
-          be considered to be IPv4 by default.
-
-    Returns:
-        An IPv4Interface or IPv6Interface object.
-
-    Raises:
-        ValueError: if the string passed isn't either a v4 or a v6
-          address.
-
-    Notes:
-        The IPv?Interface classes describe an Address on a particular
-        Network, so they're basically a combination of both the Address
-        and Network classes.
-
-    """
-    try:
-        return ipaddress.IPv4Interface(address)
-    except (ipaddress.AddressValueError, ipaddress.NetmaskValueError) as err:
-        log.debug('Error while getting IPv4 interface for address %s', address)
-        log.debug(err)
-
-    try:
-        return ipaddress.IPv6Interface(address)
-    except (ipaddress.AddressValueError, ipaddress.NetmaskValueError) as err:
-        log.debug('Error while getting IPv6 interface for address %s', address)
-        log.debug(err)
-
-    raise ValueError('{} does not appear to be an IPv4 or IPv6 interface'.format(address))
-
-
 if ipaddress:
     ipaddress.IPv6Address = IPv6AddressScoped
     if sys.version_info.major == 2:
         ipaddress.IPv6Interface = IPv6InterfaceScoped
-    ipaddress.ip_address = ip_address
-    ipaddress.ip_interface = ip_interface

From cea01e7c8f7c98419a6e18beba18b6941b21768f Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Fri, 21 Dec 2018 14:59:28 -0800
Subject: [PATCH 16/26] Updating valigdate_tgt to ensure tests pass.

---
 salt/utils/minions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/utils/minions.py b/salt/utils/minions.py
index e93af3bd7f..6d60094e28 100644
--- a/salt/utils/minions.py
+++ b/salt/utils/minions.py
@@ -718,7 +718,7 @@ class CkMinions(object):
             )
             tgt_type = expr_form
 
-        v_minions = set(self.check_minions(valid, 'compound'))
+        v_minions = set(self.check_minions(valid, 'compound').get('minions', []))
         if minions is None:
             _res = self.check_minions(expr, tgt_type)
             minions = set(_res['minions'])

From d9429348725e1ab3ff016e4aabf822a5f80d1d95 Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Wed, 26 Dec 2018 11:37:00 -0700
Subject: [PATCH 17/26] Get rid of requests import (CaseInsensitiveDict)

---
 salt/states/win_lgpo.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/salt/states/win_lgpo.py b/salt/states/win_lgpo.py
index bc5b6b9b9b..5ac4ac8179 100644
--- a/salt/states/win_lgpo.py
+++ b/salt/states/win_lgpo.py
@@ -114,7 +114,6 @@ import salt.utils.json
 
 # Import 3rd party libs
 from salt.ext import six
-from requests.structures import CaseInsensitiveDict
 
 log = logging.getLogger(__name__)
 __virtualname__ = 'lgpo'
@@ -251,14 +250,20 @@ def set_(name,
     for policy_section, policy_data in six.iteritems(pol_data):
         pol_id = None
         if policy_data and policy_data['output_section'] in current_policy:
-            # Make the subdict keys case insensitive
-            current_policy[policy_data['output_section']] = CaseInsensitiveDict(
-                current_policy[policy_data['output_section']])
             for policy_name, policy_setting in six.iteritems(policy_data['requested_policy']):
                 currently_set = False
+                # Check Case sensitive first (faster)
                 if policy_name in current_policy[policy_data['output_section']]:
                     currently_set = True
                     pol_id = policy_name
+                # Check case insensitive
+                elif policy_name.lower() in (k.lower() for k in current_policy[policy_data['output_section']]):
+                    for p_name in current_policy[policy_data['output_section']]:
+                        if policy_name.lower() == p_name.lower():
+                            currently_set = True
+                            pol_id = policy_name
+                            break
+                # Check aliases
                 else:
                     for alias in policy_data['policy_lookup'][policy_name]['policy_aliases']:
                         log.debug('checking alias %s', alias)

From 20fa5c99b6add9a99a1554d62369ee133db25232 Mon Sep 17 00:00:00 2001
From: bbh-kmd <bbh@kmd.dk>
Date: Fri, 21 Dec 2018 12:08:56 +0100
Subject: [PATCH 18/26] Update sudo.py

---
 salt/executors/sudo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/executors/sudo.py b/salt/executors/sudo.py
index b63f474b08..258aa8ead1 100644
--- a/salt/executors/sudo.py
+++ b/salt/executors/sudo.py
@@ -56,7 +56,7 @@ def execute(opts, data, func, args, kwargs):
            'salt-call',
            '--out', 'json',
            '--metadata',
-           '-c', salt.syspaths.CONFIG_DIR,
+           '-c', opts.get('config_dir'),
            '--',
            data.get('fun')]
     if data['fun'] in ('state.sls', 'state.highstate', 'state.apply'):

From b22856f8ed359e604ebfd9d4060bc8385d20fa7b Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Thu, 27 Dec 2018 12:01:15 -0700
Subject: [PATCH 19/26] Update requests to 2.21.0

---
 pkg/windows/req.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/windows/req.txt b/pkg/windows/req.txt
index f597c8e978..998164da01 100644
--- a/pkg/windows/req.txt
+++ b/pkg/windows/req.txt
@@ -31,7 +31,7 @@ pythonnet==2.3.0
 pywin32==223
 PyYAML==3.12
 pyzmq==16.0.3
-requests==2.20.1
+requests==2.21.0
 singledispatch==3.4.0.3
 smmap==0.9.0
 timelib==0.2.4

From e8b92338e9f25a0ac6d58b4bd459c399f5dc6c34 Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Thu, 27 Dec 2018 12:02:19 -0700
Subject: [PATCH 20/26] Update requests on osx

---
 pkg/osx/req.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt
index ab5549cd4a..764aae3bf4 100644
--- a/pkg/osx/req.txt
+++ b/pkg/osx/req.txt
@@ -23,7 +23,7 @@ python-dateutil==2.6.1
 python-gnupg==0.4.1
 PyYAML==3.12
 pyzmq==17.0.0
-requests==2.20.1
+requests==2.21.0
 singledispatch==3.4.0.3
 six==1.11.0
 smmap==0.9.0

From 6285b64e0ed62c70c0610312353ee596072439de Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Thu, 27 Dec 2018 17:29:47 -0700
Subject: [PATCH 21/26] Update win_wusa and add tests

---
 salt/modules/win_wusa.py            | 181 ++++++++++++++++++++++++----
 salt/states/win_wusa.py             | 167 +++++++++++++++----------
 tests/unit/modules/test_win_wusa.py | 146 ++++++++++++++++++++++
 3 files changed, 405 insertions(+), 89 deletions(-)
 create mode 100644 tests/unit/modules/test_win_wusa.py

diff --git a/salt/modules/win_wusa.py b/salt/modules/win_wusa.py
index a1a1f0e03b..39c415d0df 100644
--- a/salt/modules/win_wusa.py
+++ b/salt/modules/win_wusa.py
@@ -6,20 +6,22 @@ Microsoft Update files management via wusa.exe
 :platform:      Windows
 :depends:       PowerShell
 
-.. versionadded:: Neon
+.. versionadded:: 2018.3.4
 '''
 
 # Import python libs
 from __future__ import absolute_import, unicode_literals
 import logging
+import os
 
 # Import salt libs
 import salt.utils.platform
+from salt.exceptions import CommandExecutionError
 
 log = logging.getLogger(__name__)
 
 # Define the module's virtual name
-__virtualname__ = 'win_wusa'
+__virtualname__ = 'wusa'
 
 
 def __virtual__():
@@ -36,58 +38,189 @@ def __virtual__():
     return __virtualname__
 
 
-def is_installed(kb):
+def _pshell_json(cmd, cwd=None):
+    '''
+    Execute the desired powershell command and ensure that it returns data
+    in JSON format and load that into python
+    '''
+    if 'convertto-json' not in cmd.lower():
+        cmd = '{0} | ConvertTo-Json'.format(cmd)
+    log.debug('PowerShell: %s', cmd)
+    ret = __salt__['cmd.run_all'](cmd, shell='powershell', cwd=cwd)
+
+    if 'pid' in ret:
+        del ret['pid']
+
+    if ret.get('stderr', ''):
+        error = ret['stderr'].splitlines()[0]
+        raise CommandExecutionError(error, info=ret)
+
+    if 'retcode' not in ret or ret['retcode'] != 0:
+        # run_all logs an error to log.error, fail hard back to the user
+        raise CommandExecutionError(
+            'Issue executing PowerShell {0}'.format(cmd), info=ret)
+
+    # Sometimes Powershell returns an empty string, which isn't valid JSON
+    if ret['stdout'] == '':
+        ret['stdout'] = '{}'
+
+    try:
+        ret = salt.utils.json.loads(ret['stdout'], strict=False)
+    except ValueError:
+        raise CommandExecutionError(
+            'No JSON results from PowerShell', info=ret)
+
+    return ret
+
+
+def is_installed(name):
     '''
     Check if a specific KB is installed.
 
+    Args:
+
+        name (str):
+            The name of the KB to check
+
+    Returns:
+        bool: ``True`` if installed, otherwise ``False``
+
     CLI Example:
 
     .. code-block:: bash
 
-        salt '*' win_wusa.is_installed KB123456
+        salt '*' wusa.is_installed KB123456
     '''
-    get_hotfix_result = __salt__['cmd.powershell_all']('Get-HotFix -Id {0}'.format(kb), ignore_retcode=True)
-
-    return get_hotfix_result['retcode'] == 0
+    return __salt__['cmd.retcode'](cmd='Get-HotFix -Id {0}'.format(name),
+                                   shell='powershell',
+                                   ignore_retcode=True) == 0
 
 
-def install(path):
+def install(path, restart=False):
     '''
     Install a KB from a .msu file.
-    Some KBs will need a reboot, but this function does not manage it.
-    You may have to manage reboot yourself after installation.
+
+    Args:
+
+        path (str):
+            The full path to the msu file to install
+
+        restart (bool):
+            ``True`` to force a restart if required by the installation. Adds
+            the ``/forcerestart`` switch to the ``wusa.exe`` command. ``False``
+            will add the ``/norestart`` switch instead. Default is ``False``
+
+    Returns:
+        bool: ``True`` if successful, otherwise ``False``
+
+    Raise:
+        CommandExecutionError: If the package is already installed or an error
+            is encountered
 
     CLI Example:
 
     .. code-block:: bash
 
-        salt '*' win_wusa.install C:/temp/KB123456.msu
+        salt '*' wusa.install C:/temp/KB123456.msu
     '''
-    return __salt__['cmd.run_all']('wusa.exe {0} /quiet /norestart'.format(path), ignore_retcode=True)
+    # Build the command
+    cmd = ['wusa.exe', path, '/quiet']
+    if restart:
+        cmd.append('/forcerestart')
+    else:
+        cmd.append('/norestart')
+
+    # Run the command
+    ret_code = __salt__['cmd.retcode'](cmd, ignore_retcode=True)
+
+    # Check the ret_code
+    file_name = os.path.basename(path)
+    errors = {2359302: '{0} is already installed'.format(file_name),
+              87: 'Unknown error'}
+    if ret_code in errors:
+        raise CommandExecutionError(errors[ret_code])
+    elif ret_code:
+        raise CommandExecutionError('Unknown error: {0}'.format(ret_code))
+
+    return True
 
 
-def uninstall(kb):
+def uninstall(path, restart=False):
     '''
     Uninstall a specific KB.
 
-    CLI Example:
+    Args:
 
-    .. code-block:: bash
+        path (str):
+            The full path to the msu file to uninstall. This can also be just
+            the name of the KB to uninstall
 
-        salt '*' win_wusa.uninstall KB123456
-    '''
-    return __salt__['cmd.run_all']('wusa.exe /uninstall /kb:{0} /quiet /norestart'.format(kb[2:]), ignore_retcode=True)
+        restart (bool):
+            ``True`` to force a restart if required by the installation. Adds
+            the ``/forcerestart`` switch to the ``wusa.exe`` command. ``False``
+            will add the ``/norestart`` switch instead. Default is ``False``
 
+    Returns:
+        bool: ``True`` if successful, otherwise ``False``
 
-def list_kbs():
-    '''
-    Return a list of dictionaries, one dictionary for each installed KB.
-    The HotFixID key contains the ID of the KB.
+    Raises:
+        CommandExecutionError: If an error is encountered
 
     CLI Example:
 
     .. code-block:: bash
 
-        salt '*' win_wusa.list_kbs
+        salt '*' wusa.uninstall KB123456
+
+        # or
+
+        salt '*' wusa.uninstall C:/temp/KB123456.msu
     '''
-    return __salt__['cmd.powershell']('Get-HotFix')
+    # Build the command
+    cmd = ['wusa.exe', '/uninstall', '/quiet']
+    kb = os.path.splitext(os.path.basename(path))[0]
+    if os.path.exists(path):
+        cmd.append(path)
+    else:
+        cmd.append(
+            '/kb:{0}'.format(kb[2:] if kb.lower().startswith('kb') else kb))
+    if restart:
+        cmd.append('/forcerestart')
+    else:
+        cmd.append('/norestart')
+
+    # Run the command
+    ret_code = __salt__['cmd.retcode'](cmd, ignore_retcode=True)
+
+    # Check the ret_code
+    # If you pass /quiet and specify /kb, you'll always get retcode 87 if there
+    # is an error. Use the actual file to get a more descriptive error
+    errors = {-2145116156: '{0} does not support uninstall'.format(kb),
+              2359303: '{0} not installed'.format(kb),
+              87: 'Unknown error. Try specifying an .msu file'}
+    if ret_code in errors:
+        raise CommandExecutionError(errors[ret_code])
+    elif ret_code:
+        raise CommandExecutionError('Unknown error: {0}'.format(ret_code))
+
+    return True
+
+
+def list():
+    '''
+    Get a list of updates installed on the machine
+
+    Returns:
+        list: A list of installed updates
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' wusa.list
+    '''
+    kbs = []
+    ret = _pshell_json('Get-HotFix | Select HotFixID')
+    for item in ret:
+        kbs.append(item['HotFixID'])
+    return kbs
diff --git a/salt/states/win_wusa.py b/salt/states/win_wusa.py
index 5dd36fa4a9..3574103018 100644
--- a/salt/states/win_wusa.py
+++ b/salt/states/win_wusa.py
@@ -2,10 +2,10 @@
 '''
 Microsoft Updates (KB) Management
 
-This module provides the ability to enforce KB installations
-from files (.msu), without WSUS.
+This module provides the ability to enforce KB installations from files (.msu),
+without WSUS or Windows Update
 
-.. versionadded:: Neon
+.. versionadded:: 2018.3.4
 '''
 
 # Import python libs
@@ -14,13 +14,14 @@ import logging
 
 # Import salt libs
 import salt.utils.platform
-import salt.exceptions
+import salt.utils.url
+from salt.exceptions import SaltInvocationError
 
 log = logging.getLogger(__name__)
 
 
 # Define the module's virtual name
-__virtualname__ = 'win_wusa'
+__virtualname__ = 'wusa'
 
 
 def __virtual__():
@@ -35,81 +36,117 @@ def __virtual__():
 
 def installed(name, source):
     '''
-    Enforce the installed state of a KB
+    Ensure an update is installed on the minion
 
-    name
-        Name of the Windows KB ("KB123456")
-    source
-        Source of .msu file corresponding to the KB
+    Args:
 
+        name(str):
+            Name of the Windows KB ("KB123456")
+
+        source (str):
+            Source of .msu file corresponding to the KB
+
+    Example:
+
+    .. code-block:: yaml
+
+        KB123456:
+          wusa.installed:
+            - source: salt://kb123456.msu
     '''
-    ret = {
-        'name': name,
-        'changes': {},
-        'result': False,
-        'comment': '',
-        }
+    ret = {'name': name,
+           'changes': {},
+           'result': False,
+           'comment': ''}
 
-    # Start with basic error-checking. Do all the passed parameters make sense
-    # and agree with each-other?
-    if not name or not source:
-        raise salt.exceptions.SaltInvocationError(
-            'Arguments "name" and "source" are mandatory.')
+    # Input validation
+    if not name:
+        raise SaltInvocationError('Must specify a KB "name"')
+    if not source:
+        raise SaltInvocationError('Must specify a "source" file to install')
 
-    # Check the current state of the system. Does anything need to change?
-    current_state = __salt__['win_wusa.is_installed'](name)
-
-    if current_state:
+    # Is the KB already installed
+    if __salt__['wusa.is_installed'](name):
         ret['result'] = True
-        ret['comment'] = 'KB already installed'
+        ret['comment'] = '{0} already installed'.format(name)
         return ret
 
-    # The state of the system does need to be changed. Check if we're running
-    # in ``test=true`` mode.
+    # Check for test=True
     if __opts__['test'] is True:
-        ret['comment'] = 'The KB "{0}" will be installed.'.format(name)
-        ret['changes'] = {
-            'old': current_state,
-            'new': True,
-        }
-
-        # Return ``None`` when running with ``test=true``.
         ret['result'] = None
-
+        ret['comment'] = 'The KB "{0}" would be installed.'.format(name)
+        ret['result'] = None
         return ret
 
-    try:
-        result = __states__['file.cached'](source,
-                                           skip_verify=True,
-                                           saltenv=__env__)
-    except Exception as exc:
-        msg = 'Failed to cache {0}: {1}'.format(
-                salt.utils.url.redact_http_basic_auth(source),
-                exc.__str__())
-        log.exception(msg)
+    # Cache the file
+    cached_source_path = __salt__['cp.cache_file'](path=source, saltenv=__env__)
+    if not cached_source_path:
+        msg = 'Unable to cache {0} from saltenv \'{1}\''.format(
+            salt.utils.url.redact_http_basic_auth(source), __env__)
         ret['comment'] = msg
         return ret
 
-    if result['result']:
-        # Get the path of the file in the minion cache
-        cached = __salt__['cp.is_cached'](source, saltenv=__env__)
+    # Install the KB
+    __salt__['wusa.install'](cached_source_path)
+
+    # Verify successful install
+    if __salt__['wusa.is_installed'](name):
+        ret['comment'] = 'The KB "{0}" was installed!'.format(name)
+        ret['changes'] = {'old': False, 'new': True}
+        ret['result'] = True
     else:
-        log.debug(
-            'failed to download %s',
-            salt.utils.url.redact_http_basic_auth(source)
-        )
-        return result
-
-    # Finally, make the actual change and return the result.
-    new_state = __salt__['win_wusa.install'](cached)
-
-    ret['comment'] = 'The KB "{0}" was installed!'.format(name)
-
-    ret['changes'] = {
-        'old': current_state,
-        'new': new_state,
-    }
-
-    ret['result'] = True
+        ret['comment'] = '{0} failed to install'.format(name)
+
+    return ret
+
+
+def uninstalled(name):
+    '''
+    Ensure an update is uninstalled from the minion
+
+    Args:
+
+        name(str):
+            Name of the Windows KB ("KB123456")
+
+    Example:
+
+    .. code-block:: yaml
+
+        KB123456:
+          wusa.uninstalled
+    '''
+    ret = {'name': name,
+           'changes': {},
+           'result': False,
+           'comment': ''}
+
+    # Input validation
+    if not name:
+        raise SaltInvocationError('Must specify a KB "name"')
+
+    # Is the KB already uninstalled
+    if not __salt__['wusa.is_installed'](name):
+        ret['result'] = True
+        ret['comment'] = '{0} already uninstalled'.format(name)
+        return ret
+
+    # Check for test=True
+    if __opts__['test'] is True:
+        ret['result'] = None
+        ret['comment'] = 'The KB "{0}" would be uninstalled.'.format(name)
+        ret['result'] = None
+        return ret
+
+    # Uninstall the KB
+    __salt__['wusa.uninstall'](name)
+
+    # Verify successful uninstall
+    if not __salt__['wusa.is_installed'](name):
+        ret['comment'] = 'The KB "{0}" was uninstalled!'.format(name)
+        ret['changes'] = {'old': True, 'new': False}
+        ret['result'] = True
+    else:
+        ret['comment'] = '{0} failed to uninstall'.format(name)
 
     return ret
diff --git a/tests/unit/modules/test_win_wusa.py b/tests/unit/modules/test_win_wusa.py
new file mode 100644
index 0000000000..59458b7e10
--- /dev/null
+++ b/tests/unit/modules/test_win_wusa.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+
+# Import Python Libs
+from __future__ import absolute_import, unicode_literals, print_function
+
+# Import Salt Testing Libs
+from tests.support.helpers import destructiveTest
+from tests.support.mixins import LoaderModuleMockMixin
+from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
+from tests.support.unit import TestCase, skipIf
+
+# Import Salt Libs
+import salt.utils.platform
+import salt.modules.win_wusa as win_wusa
+from salt.exceptions import CommandExecutionError
+
+
+@skipIf(NO_MOCK, NO_MOCK_REASON)
+@skipIf(not salt.utils.platform.is_windows(), 'System is not Windows')
+class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
+    def setup_loader_modules(self):
+        return {win_wusa: {}}
+
+    def test_is_installed_false(self):
+        mock_retcode = MagicMock(return_value=1)
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            self.assertFalse(win_wusa.is_installed('KB123456'))
+
+    def test_is_installed_true(self):
+        mock_retcode = MagicMock(return_value=0)
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            self.assertTrue(win_wusa.is_installed('KB123456'))
+
+    def test_list(self):
+        ret = {'pid': 1,
+               'retcode': 0,
+               'stderr': '',
+               'stdout': '[{"HotFixID": "KB123456"}, '
+                         '{"HotFixID": "KB123457"}]'}
+        mock_all = MagicMock(return_value=ret)
+        with patch.dict(win_wusa.__salt__, {'cmd.run_all': mock_all}):
+            expected = ['KB123456', 'KB123457']
+            returned = win_wusa.list()
+            self.assertListEqual(expected, returned)
+
+    def test_install(self):
+        mock_retcode = MagicMock(return_value=0)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            self.assertTrue(win_wusa.install(path))
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', path, '/quiet', '/norestart'], ignore_retcode=True)
+
+    def test_install_restart(self):
+        mock_retcode = MagicMock(return_value=0)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            self.assertTrue(win_wusa.install(path, restart=True))
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', path, '/quiet', '/forcerestart'], ignore_retcode=True)
+
+    def test_install_already_installed(self):
+        mock_retcode = MagicMock(return_value=2359302)
+        path = 'C:\\KB123456.msu'
+        name = 'KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            with self.assertRaises(CommandExecutionError) as excinfo:
+                win_wusa.install(path)
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', path, '/quiet', '/norestart'], ignore_retcode=True)
+        self.assertEqual('{0} is already installed'.format(name),
+                         excinfo.exception.strerror)
+
+    def test_install_error_87(self):
+        mock_retcode = MagicMock(return_value=87)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            with self.assertRaises(CommandExecutionError) as excinfo:
+                win_wusa.install(path)
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', path, '/quiet', '/norestart'], ignore_retcode=True)
+        self.assertEqual('Unknown error', excinfo.exception.strerror)
+
+    def test_install_error_other(self):
+        mock_retcode = MagicMock(return_value=1234)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            with self.assertRaises(CommandExecutionError) as excinfo:
+                win_wusa.install(path)
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', path, '/quiet', '/norestart'], ignore_retcode=True)
+        self.assertEqual('Unknown error: 1234', excinfo.exception.strerror)
+
+    def test_uninstall_kb(self):
+        mock_retcode = MagicMock(return_value=0)
+        kb = 'KB123456'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
+                patch("os.path.exists", MagicMock(return_value=False)):
+            self.assertTrue(win_wusa.uninstall(kb))
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', '/uninstall', '/quiet', '/kb:{0}'.format(kb[2:]), '/norestart'],
+            ignore_retcode=True)
+
+    def test_uninstall_path(self):
+        mock_retcode = MagicMock(return_value=0)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
+                patch("os.path.exists", MagicMock(return_value=True)):
+            self.assertTrue(win_wusa.uninstall(path))
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', '/uninstall', '/quiet', path, '/norestart'],
+            ignore_retcode=True)
+
+    def test_uninstall_path_restart(self):
+        mock_retcode = MagicMock(return_value=0)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
+             patch("os.path.exists", MagicMock(return_value=True)):
+            self.assertTrue(win_wusa.uninstall(path, restart=True))
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', '/uninstall', '/quiet', path, '/forcerestart'],
+            ignore_retcode=True)
+
+    def test_uninstall_already_uninstalled(self):
+        mock_retcode = MagicMock(return_value=2359303)
+        kb = 'KB123456'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
+            with self.assertRaises(CommandExecutionError) as excinfo:
+                win_wusa.uninstall(kb)
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', '/uninstall', '/quiet', '/kb:{0}'.format(kb[2:]), '/norestart'],
+            ignore_retcode=True)
+        self.assertEqual('{0} not installed'.format(kb),
+                         excinfo.exception.strerror)
+
+    def test_uninstall_path_error_other(self):
+        mock_retcode = MagicMock(return_value=1234)
+        path = 'C:\\KB123456.msu'
+        with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
+                patch("os.path.exists", MagicMock(return_value=True)), \
+                self.assertRaises(CommandExecutionError) as excinfo:
+            win_wusa.uninstall(path)
+        mock_retcode.assert_called_once_with(
+            ['wusa.exe', '/uninstall', '/quiet', path, '/norestart'],
+            ignore_retcode=True)
+        self.assertEqual('Unknown error: 1234', excinfo.exception.strerror)

From 17502700fc2ec09f6dd37ed8974dd56e421efe63 Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Fri, 28 Dec 2018 11:57:23 -0700
Subject: [PATCH 22/26] Add state tests for win_wusa

---
 salt/states/win_wusa.py            |  14 ++-
 tests/unit/states/test_win_wusa.py | 137 +++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+), 9 deletions(-)
 create mode 100644 tests/unit/states/test_win_wusa.py

diff --git a/salt/states/win_wusa.py b/salt/states/win_wusa.py
index 3574103018..c73bb02147 100644
--- a/salt/states/win_wusa.py
+++ b/salt/states/win_wusa.py
@@ -74,14 +74,14 @@ def installed(name, source):
     # Check for test=True
     if __opts__['test'] is True:
         ret['result'] = None
-        ret['comment'] = 'The KB "{0}" would be installed.'.format(name)
+        ret['comment'] = '{0} would be installed'.format(name)
         ret['result'] = None
         return ret
 
     # Cache the file
     cached_source_path = __salt__['cp.cache_file'](path=source, saltenv=__env__)
     if not cached_source_path:
-        msg = 'Unable to cache {0} from saltenv \'{1}\''.format(
+        msg = 'Unable to cache {0} from saltenv "{1}"'.format(
             salt.utils.url.redact_http_basic_auth(source), __env__)
         ret['comment'] = msg
         return ret
@@ -91,7 +91,7 @@ def installed(name, source):
 
     # Verify successful install
     if __salt__['wusa.is_installed'](name):
-        ret['comment'] = 'The KB "{0}" was installed!'.format(name)
+        ret['comment'] = '{0} was installed'.format(name)
         ret['changes'] = {'old': False, 'new': True}
         ret['result'] = True
     else:
@@ -121,10 +121,6 @@ def uninstalled(name):
            'result': False,
            'comment': ''}
 
-    # Input validation
-    if not name:
-        raise SaltInvocationError('Must specify a KB "name"')
-
     # Is the KB already uninstalled
     if not __salt__['wusa.is_installed'](name):
         ret['result'] = True
@@ -134,7 +130,7 @@ def uninstalled(name):
     # Check for test=True
     if __opts__['test'] is True:
         ret['result'] = None
-        ret['comment'] = 'The KB "{0}" would be uninstalled.'.format(name)
+        ret['comment'] = '{0} would be uninstalled'.format(name)
         ret['result'] = None
         return ret
 
@@ -143,7 +139,7 @@ def uninstalled(name):
 
     # Verify successful uninstall
     if not __salt__['wusa.is_installed'](name):
-        ret['comment'] = 'The KB "{0}" was uninstalled!'.format(name)
+        ret['comment'] = '{0} was uninstalled'.format(name)
         ret['changes'] = {'old': True, 'new': False}
         ret['result'] = True
     else:
diff --git a/tests/unit/states/test_win_wusa.py b/tests/unit/states/test_win_wusa.py
new file mode 100644
index 0000000000..16c3c75def
--- /dev/null
+++ b/tests/unit/states/test_win_wusa.py
@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+
+# Import Python libs
+from __future__ import absolute_import, unicode_literals, print_function
+
+# Import Salt Libs
+import salt.states.win_wusa as wusa
+from salt.exceptions import SaltInvocationError
+
+# Import Salt Testing Libs
+from tests.support.mixins import LoaderModuleMockMixin
+from tests.support.unit import TestCase
+from tests.support.mock import MagicMock, patch
+
+
+class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
+
+    kb = 'KB123456'
+
+    def setup_loader_modules(self):
+        return {wusa: {'__opts__': {'test': False},
+                       '__env__': 'base'}}
+
+    def test_installed_no_source(self):
+        with self.assertRaises(SaltInvocationError) as excinfo:
+            wusa.installed(name='KB123456', source=None)
+
+        self.assertEqual(excinfo.exception.strerror,
+                         'Must specify a "source" file to install')
+
+    def test_installed_existing(self):
+        mock_installed = MagicMock(return_value=True)
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}):
+            returned = wusa.installed(name=self.kb,
+                                      source='salt://{0}.msu'.format(self.kb))
+            expected = {'changes': {},
+                        'comment': '{0} already installed'.format(self.kb),
+                        'name': self.kb,
+                        'result': True}
+            self.assertDictEqual(expected, returned)
+
+    def test_installed_test_true(self):
+        mock_installed = MagicMock(return_value=False)
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}), \
+                patch.dict(wusa.__opts__, {'test': True}):
+            returned = wusa.installed(name=self.kb,
+                                      source='salt://{0}.msu'.format(self.kb))
+            expected = {'changes': {},
+                        'comment': '{0} would be installed'.format(self.kb),
+                        'name': self.kb,
+                        'result': None}
+            self.assertDictEqual(expected, returned)
+
+    def test_installed_cache_fail(self):
+        mock_installed = MagicMock(return_value=False)
+        mock_cache = MagicMock(return_value='')
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
+                                        'cp.cache_file': mock_cache}):
+            returned = wusa.installed(name=self.kb,
+                                      source='salt://{0}.msu'.format(self.kb))
+            expected = {'changes': {},
+                        'comment': 'Unable to cache salt://{0}.msu from '
+                                   'saltenv "base"'.format(self.kb),
+                        'name': self.kb,
+                        'result': False}
+            self.assertDictEqual(expected, returned)
+
+    def test_installed(self):
+        mock_installed = MagicMock(side_effect=[False, True])
+        mock_cache = MagicMock(return_value='C:\\{0}.msu'.format(self.kb))
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
+                                        'cp.cache_file': mock_cache,
+                                        'wusa.install': MagicMock()}):
+            returned = wusa.installed(name=self.kb,
+                                      source='salt://{0}.msu'.format(self.kb))
+            expected = {'changes': {'new': True, 'old': False},
+                        'comment': '{0} was installed'.format(self.kb),
+                        'name': self.kb,
+                        'result': True}
+            self.assertDictEqual(expected, returned)
+
+    def test_installed_failed(self):
+        mock_installed = MagicMock(side_effect=[False, False])
+        mock_cache = MagicMock(return_value='C:\\{0}.msu'.format(self.kb))
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
+                                        'cp.cache_file': mock_cache,
+                                        'wusa.install': MagicMock()}):
+            returned = wusa.installed(name=self.kb,
+                                      source='salt://{0}.msu'.format(self.kb))
+            expected = {'changes': {},
+                        'comment': '{0} failed to install'.format(self.kb),
+                        'name': self.kb,
+                        'result': False}
+            self.assertDictEqual(expected, returned)
+
+    def test_uninstalled_non_existing(self):
+        mock_installed = MagicMock(return_value=False)
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}):
+            returned = wusa.uninstalled(name=self.kb)
+            expected = {'changes': {},
+                        'comment': '{0} already uninstalled'.format(self.kb),
+                        'name': self.kb,
+                        'result': True}
+            self.assertDictEqual(expected, returned)
+
+    def test_uninstalled_test_true(self):
+        mock_installed = MagicMock(return_value=True)
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}), \
+                patch.dict(wusa.__opts__, {'test': True}):
+            returned = wusa.uninstalled(name=self.kb)
+            expected = {'changes': {},
+                        'comment': '{0} would be uninstalled'.format(self.kb),
+                        'name': self.kb,
+                        'result': None}
+            self.assertDictEqual(expected, returned)
+
+    def test_uninstalled(self):
+        mock_installed = MagicMock(side_effect=[True, False])
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
+                                        'wusa.uninstall': MagicMock()}):
+            returned = wusa.uninstalled(name=self.kb)
+            expected = {'changes': {'new': False, 'old': True},
+                        'comment': '{0} was uninstalled'.format(self.kb),
+                        'name': self.kb,
+                        'result': True}
+            self.assertDictEqual(expected, returned)
+
+    def test_uninstalled_failed(self):
+        mock_installed = MagicMock(side_effect=[True, True])
+        with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
+                                        'wusa.uninstall': MagicMock()}):
+            returned = wusa.uninstalled(name=self.kb)
+            expected = {'changes': {},
+                        'comment': '{0} failed to uninstall'.format(self.kb),
+                        'name': self.kb,
+                        'result': False}
+            self.assertDictEqual(expected, returned)

From c0d249571387ae19fffb1ff6772e42b4650b007f Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Fri, 28 Dec 2018 12:18:48 -0700
Subject: [PATCH 23/26] Fix lint, add test docs

---
 tests/unit/modules/test_win_wusa.py | 46 ++++++++++++++++++++++++++++-
 tests/unit/states/test_win_wusa.py  | 34 ++++++++++++++++++++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/tests/unit/modules/test_win_wusa.py b/tests/unit/modules/test_win_wusa.py
index 59458b7e10..ee696063eb 100644
--- a/tests/unit/modules/test_win_wusa.py
+++ b/tests/unit/modules/test_win_wusa.py
@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
+'''
+Test the win_wusa execution module
+'''
 
 # Import Python Libs
 from __future__ import absolute_import, unicode_literals, print_function
 
 # Import Salt Testing Libs
-from tests.support.helpers import destructiveTest
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
 from tests.support.unit import TestCase, skipIf
@@ -18,20 +20,32 @@ from salt.exceptions import CommandExecutionError
 @skipIf(NO_MOCK, NO_MOCK_REASON)
 @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows')
 class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
+    '''
+    test the functions in the win_wusa execution module
+    '''
     def setup_loader_modules(self):
         return {win_wusa: {}}
 
     def test_is_installed_false(self):
+        '''
+        test is_installed function when the KB is not installed
+        '''
         mock_retcode = MagicMock(return_value=1)
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
             self.assertFalse(win_wusa.is_installed('KB123456'))
 
     def test_is_installed_true(self):
+        '''
+        test is_installed function when the KB is installed
+        '''
         mock_retcode = MagicMock(return_value=0)
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
             self.assertTrue(win_wusa.is_installed('KB123456'))
 
     def test_list(self):
+        '''
+        test list function
+        '''
         ret = {'pid': 1,
                'retcode': 0,
                'stderr': '',
@@ -44,6 +58,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertListEqual(expected, returned)
 
     def test_install(self):
+        '''
+        test install function
+        '''
         mock_retcode = MagicMock(return_value=0)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
@@ -52,6 +69,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             ['wusa.exe', path, '/quiet', '/norestart'], ignore_retcode=True)
 
     def test_install_restart(self):
+        '''
+        test install function with restart=True
+        '''
         mock_retcode = MagicMock(return_value=0)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
@@ -60,6 +80,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             ['wusa.exe', path, '/quiet', '/forcerestart'], ignore_retcode=True)
 
     def test_install_already_installed(self):
+        '''
+        test install function when KB already installed
+        '''
         mock_retcode = MagicMock(return_value=2359302)
         path = 'C:\\KB123456.msu'
         name = 'KB123456.msu'
@@ -72,6 +95,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
                          excinfo.exception.strerror)
 
     def test_install_error_87(self):
+        '''
+        test install function when error 87 returned
+        '''
         mock_retcode = MagicMock(return_value=87)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
@@ -82,6 +108,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
         self.assertEqual('Unknown error', excinfo.exception.strerror)
 
     def test_install_error_other(self):
+        '''
+        test install function on other unknown error
+        '''
         mock_retcode = MagicMock(return_value=1234)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
@@ -92,6 +121,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
         self.assertEqual('Unknown error: 1234', excinfo.exception.strerror)
 
     def test_uninstall_kb(self):
+        '''
+        test uninstall function passing kb name
+        '''
         mock_retcode = MagicMock(return_value=0)
         kb = 'KB123456'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
@@ -102,6 +134,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             ignore_retcode=True)
 
     def test_uninstall_path(self):
+        '''
+        test uninstall function passing full path to .msu file
+        '''
         mock_retcode = MagicMock(return_value=0)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
@@ -112,6 +147,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             ignore_retcode=True)
 
     def test_uninstall_path_restart(self):
+        '''
+        test uninstall function with full path and restart=True
+        '''
         mock_retcode = MagicMock(return_value=0)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
@@ -122,6 +160,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             ignore_retcode=True)
 
     def test_uninstall_already_uninstalled(self):
+        '''
+        test uninstall function when KB already uninstalled
+        '''
         mock_retcode = MagicMock(return_value=2359303)
         kb = 'KB123456'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}):
@@ -134,6 +175,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
                          excinfo.exception.strerror)
 
     def test_uninstall_path_error_other(self):
+        '''
+        test uninstall function with unknown error
+        '''
         mock_retcode = MagicMock(return_value=1234)
         path = 'C:\\KB123456.msu'
         with patch.dict(win_wusa.__salt__, {'cmd.retcode': mock_retcode}), \
diff --git a/tests/unit/states/test_win_wusa.py b/tests/unit/states/test_win_wusa.py
index 16c3c75def..b0402fe706 100644
--- a/tests/unit/states/test_win_wusa.py
+++ b/tests/unit/states/test_win_wusa.py
@@ -14,7 +14,9 @@ from tests.support.mock import MagicMock, patch
 
 
 class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
-
+    '''
+    test the function in the win_wusa state module
+    '''
     kb = 'KB123456'
 
     def setup_loader_modules(self):
@@ -22,6 +24,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
                        '__env__': 'base'}}
 
     def test_installed_no_source(self):
+        '''
+        test wusa.installed without passing source
+        '''
         with self.assertRaises(SaltInvocationError) as excinfo:
             wusa.installed(name='KB123456', source=None)
 
@@ -29,6 +34,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
                          'Must specify a "source" file to install')
 
     def test_installed_existing(self):
+        '''
+        test wusa.installed when the kb is already installed
+        '''
         mock_installed = MagicMock(return_value=True)
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}):
             returned = wusa.installed(name=self.kb,
@@ -40,6 +48,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_installed_test_true(self):
+        '''
+        test wusa.installed with test=True
+        '''
         mock_installed = MagicMock(return_value=False)
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}), \
                 patch.dict(wusa.__opts__, {'test': True}):
@@ -52,6 +63,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_installed_cache_fail(self):
+        '''
+        test wusa.install when it fails to cache the file
+        '''
         mock_installed = MagicMock(return_value=False)
         mock_cache = MagicMock(return_value='')
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
@@ -66,6 +80,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_installed(self):
+        '''
+        test wusa.installed assuming success
+        '''
         mock_installed = MagicMock(side_effect=[False, True])
         mock_cache = MagicMock(return_value='C:\\{0}.msu'.format(self.kb))
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
@@ -80,6 +97,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_installed_failed(self):
+        '''
+        test wusa.installed with a failure
+        '''
         mock_installed = MagicMock(side_effect=[False, False])
         mock_cache = MagicMock(return_value='C:\\{0}.msu'.format(self.kb))
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
@@ -94,6 +114,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_uninstalled_non_existing(self):
+        '''
+        test wusa.uninstalled when the kb is not installed
+        '''
         mock_installed = MagicMock(return_value=False)
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}):
             returned = wusa.uninstalled(name=self.kb)
@@ -104,6 +127,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_uninstalled_test_true(self):
+        '''
+        test wusa.uninstalled with test=True
+        '''
         mock_installed = MagicMock(return_value=True)
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed}), \
                 patch.dict(wusa.__opts__, {'test': True}):
@@ -115,6 +141,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_uninstalled(self):
+        '''
+        test wusa.uninstalled assuming success
+        '''
         mock_installed = MagicMock(side_effect=[True, False])
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
                                         'wusa.uninstall': MagicMock()}):
@@ -126,6 +155,9 @@ class WinWusaTestCase(TestCase, LoaderModuleMockMixin):
             self.assertDictEqual(expected, returned)
 
     def test_uninstalled_failed(self):
+        '''
+        test wusa.uninstalled with a failure
+        '''
         mock_installed = MagicMock(side_effect=[True, True])
         with patch.dict(wusa.__salt__, {'wusa.is_installed': mock_installed,
                                         'wusa.uninstall': MagicMock()}):

From d4ac180209042892005ec9d080718b458e72e880 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Fri, 28 Dec 2018 11:33:13 -0800
Subject: [PATCH 24/26] Fixing the arguments accepted by cli function in the
 junos state module which are passed along to the cli function in junos
 module, so they align.

---
 salt/states/junos.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/states/junos.py b/salt/states/junos.py
index 816f26f596..82aa3756b0 100644
--- a/salt/states/junos.py
+++ b/salt/states/junos.py
@@ -202,7 +202,7 @@ def diff(name, d_id):
     return ret
 
 
-def cli(name, format='text', **kwargs):
+def cli(name, **kwargs):
     '''
     Executes the CLI commands and reuturns the text output.
 
@@ -218,10 +218,10 @@ def cli(name, format='text', **kwargs):
         * command:
           The command that need to be executed on Junos CLI. (default = None)
       Optional
-        * format:
-          Format in which to get the CLI output. (text or xml, \
-            default = 'text')
         * kwargs: Keyworded arguments which can be provided like-
+            * format:
+              Format in which to get the CLI output. (text or xml, \
+                default = 'text')
             * timeout:
               Set NETCONF RPC timeout. Can be used for commands which
               take a while to execute. (default = 30 seconds)
@@ -230,7 +230,7 @@ def cli(name, format='text', **kwargs):
                (default = None)
     '''
     ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''}
-    ret['changes'] = __salt__['junos.cli'](name, format, **kwargs)
+    ret['changes'] = __salt__['junos.cli'](name, **kwargs)
     return ret
 
 

From 5563631f3952d92547c852bc6faf2d3155952f89 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@saltstack.com>
Date: Thu, 13 Dec 2018 12:29:45 -0700
Subject: [PATCH 25/26] Let minions try to connect to master indefinitly

---
 salt/minion.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/salt/minion.py b/salt/minion.py
index 5e59db2a6e..16edb31885 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -974,9 +974,8 @@ class MinionManager(MinionBase):
         '''
         if not self.minions:
             err = ('Minion unable to successfully connect to '
-                   'a Salt Master.  Exiting.')
+                   'a Salt Master.')
             log.error(err)
-            raise SaltSystemExit(code=42, msg=err)
 
     def _spawn_minions(self, timeout=60):
         '''

From ab980fb195c4fc55ad63aefa81f265c8d046182a Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Mon, 31 Dec 2018 17:41:27 +0100
Subject: [PATCH 26/26] ssh module: missing space in error message

---
 salt/modules/ssh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/modules/ssh.py b/salt/modules/ssh.py
index 02ff0ba27c..7a0208678b 100644
--- a/salt/modules/ssh.py
+++ b/salt/modules/ssh.py
@@ -1227,7 +1227,7 @@ def set_known_host(user=None,
 
         if fingerprint and fingerprint not in known_fingerprints:
             return {'status': 'error',
-                    'error': ('Remote host public keys found but none of their'
+                    'error': ('Remote host public keys found but none of their '
                               'fingerprints match the one you have provided')}
 
         if check_required: