Merge branch '2018.3' into redis-fix

salt/utils/vault.py

@@ -91,7 +91,7 @@ def _get_token_and_url_from_master():
            }
 
 
-def _get_vault_connection():
+def get_vault_connection():
     '''
     Get the connection details for calling Vault, from local configuration if
     it exists, or from the master otherwise
@@ -139,7 +139,7 @@ def make_request(method, resource, profile=None, **args):
         # Deprecated code path
         return make_request_with_profile(method, resource, profile, **args)
 
-    connection = _get_vault_connection()
+    connection = get_vault_connection()
     token, vault_url = connection['token'], connection['url']
     if 'verify' not in args:
         args['verify'] = connection['verify']

tests/integration/modules/test_pip.py

@@ -53,6 +53,8 @@ class PipModuleTest(ModuleCase):
         del self.pip_temp
         if 'PIP_SOURCE_DIR' in os.environ:
             os.environ.pop('PIP_SOURCE_DIR')
+        if 'PIP_BUILD_DIR' in os.environ:
+            os.environ.pop('PIP_BUILD_DIR')
 
     def _check_download_error(self, ret):
         '''

tests/integration/modules/test_system.py

@@ -12,7 +12,7 @@ import textwrap
 # Import Salt Testing libs
 from tests.support.case import ModuleCase
 from tests.support.unit import skipIf
-from tests.support.helpers import destructiveTest, skip_if_not_root
+from tests.support.helpers import destructiveTest, skip_if_not_root, flaky
 
 # Import Salt libs
 import salt.utils.files
@@ -255,6 +255,7 @@ class SystemModuleTest(ModuleCase):
         self.assertTrue(self._same_times(time_now, cmp_time), msg=msg)
         self._test_hwclock_sync()
 
+    @flaky
     @destructiveTest
     @skip_if_not_root
     def test_set_system_time(self):