Merge branch '2018.3' into 'fluorine'

Conflicts:
  - tests/integration/states/test_pip_state.py

pkg/osx/shasums/openssl-1.0.2n.tar.gz.sha512

@@ -1 +0,0 @@
-144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687  ./openssl-1.0.2n.tar.gz

tests/integration/reactor/test_reactor.py

@@ -24,7 +24,7 @@ class ReactorTest(ModuleCase, SaltMinionEventAssertsMixin):
     Test Salt's reactor system
     '''
 
-    @flaky()
+    @flaky
     def test_ping_reaction(self):
         '''
         Fire an event on the master and ensure

tests/integration/shell/test_call.py

@@ -373,6 +373,7 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin
             if os.path.isdir(config_dir):
                 shutil.rmtree(config_dir)
 
+    @skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
     @flaky
     def test_issue_15074_output_file_append(self):
         output_file_append = os.path.join(TMP, 'issue-15074')
@@ -406,6 +407,7 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin
             if os.path.exists(output_file_append):
                 os.unlink(output_file_append)
 
+    @skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
     @flaky
     def test_issue_14979_output_file_permissions(self):
         output_file = os.path.join(TMP, 'issue-14979')

tests/integration/shell/test_matcher.py

@@ -11,6 +11,7 @@ from tests.support.case import ShellCase
 from tests.support.helpers import flaky
 from tests.support.mixins import ShellCaseCommonTestsMixin
 from tests.support.paths import TMP
+from tests.support.unit import skipIf
 
 # Import salt libs
 import salt.utils.files
@@ -92,12 +93,14 @@ class MatchTest(ShellCase, ShellCaseCommonTestsMixin):
         assert minion_in_returns('minion', data) is True
         assert minion_in_returns('sub_minion', data) is True
 
+    @skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
     @flaky
     def test_compound_pillar(self):
         data = self.run_salt("-C 'I%@companions%three%sarah*' test.ping")
         assert minion_in_returns('minion', data) is True
         assert minion_in_returns('sub_minion', data) is True
 
+    @skipIf(True, 'This test is unreliable. Need to investigate why more deeply.')
     @flaky
     def test_coumpound_pillar_pcre(self):
         data = self.run_salt("-C 'J%@knights%^(Lancelot|Galahad)$' test.ping")

tests/integration/states/test_file.py

@@ -872,7 +872,13 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
 
         initial_mode = '0111'
         changed_mode = '0555'
-        default_mode = '0755'
+
+        initial_modes = {0: {sub: '0755',
+                             subsub: '0111'},
+                         1: {sub: '0111',
+                             subsub: '0111'},
+                         2: {sub: '0111',
+                             subsub: '0111'}}
 
         if not os.path.isdir(subsub):
             os.makedirs(subsub, int(initial_mode, 8))
@@ -893,7 +899,8 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
                     # the mode of intermediate directories to the mode that
                     # is passed.
                     if sys.version_info >= (3, 7):
-                        self.assertEqual(default_mode,
+                        _mode = initial_modes[depth][untouched_dir]
+                        self.assertEqual(_mode,
                                          _get_oct_mode(untouched_dir))
                     else:
                         self.assertEqual(initial_mode,
@@ -2329,7 +2336,9 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
             if salt.utils.platform.is_windows():
                 import subprocess
                 import win32api
-                p = subprocess.Popen(salt.utils.stringutils.to_str('type {}'.format(win32api.GetShortPathName(test_file))),
+                p = subprocess.Popen(
+                    salt.utils.stringutils.to_str(
+                        'type {}'.format(win32api.GetShortPathName(test_file))),
                     shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 p.poll()
                 out = p.stdout.read()

tests/integration/states/test_pip_state.py

@@ -317,6 +317,8 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
 
     @destructiveTest
     @skip_if_not_root
+    @skipIf(salt.utils.platform.is_darwin(), 'Test is flaky on macosx')
+    @skipIf(not CAN_RUNAS, 'Runas support required')
     @with_system_user('issue-6912', on_existing='delete', delete=True,
                       password='PassWord1!')
     @with_tempdir()

tests/integration/states/test_virtualenv_mod.py

@@ -28,6 +28,7 @@ from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class VirtualenvTest(ModuleCase, SaltReturnAssertsMixin):
+    @skipIf(salt.utils.platform.is_darwin(), 'Test is flaky on macosx')
     @destructiveTest
     @skip_if_not_root
     def test_issue_1959_virtualenv_runas(self):

tests/unit/utils/test_stringutils.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 from __future__ import absolute_import, print_function, unicode_literals
 import re
 import sys