Move whatever we need from salttesting to salt.

Let's drop the salttesting dependency cycle.

tests/integration/__init__.py

@@ -47,14 +47,12 @@ if CODE_DIR not in sys.path:
 # Import salt tests support dirs
 from tests.support.paths import *  # pylint: disable=wildcard-import
 from tests.support.processes import *  # pylint: disable=wildcard-import
-
-# Import Salt Testing libs
-from salttesting import TestCase
-from salttesting.case import ShellTestCase
-from salttesting.mixins import CheckShellBinaryNameAndVersionMixIn
-from salttesting.parser import PNUM, print_header, SaltTestcaseParser
-from salttesting.helpers import requires_sshd_server
-from salttesting.helpers import ensure_in_syspath, RedirectStdStreams
+from tests.support.unit import TestCase
+from tests.support.case import ShellTestCase
+from tests.support.mixins import CheckShellBinaryNameAndVersionMixin, ShellCaseCommonTestsMixin
+from tests.support.parser import PNUM, print_header, SaltTestcaseParser
+from tests.support.helpers import requires_sshd_server
+from tests.support.helpers import ensure_in_syspath, RedirectStdStreams
 
 # Import Salt libs
 import salt
@@ -109,92 +107,6 @@ from tornado import ioloop
 
 # Import salt tests support libs
 from tests.support.processes import SaltMaster, SaltMinion, SaltSyndic
-try:
-    from salttesting.helpers import terminate_process_pid
-except ImportError:
-    # Once the latest salt-testing works against salt's develop branch
-    # uncomment the following 2 lines and delete the function defined
-    # in this except
-    #print('Please upgrade your version of salt-testing')
-    #sys.exit(1)
-
-    import psutil
-
-    def terminate_process_pid(pid, only_children=False):
-        children = []
-        process = None
-
-        # Let's begin the shutdown routines
-        try:
-            process = psutil.Process(pid)
-            if hasattr(process, 'children'):
-                children = process.children(recursive=True)
-        except psutil.NoSuchProcess:
-            log.info('No process with the PID %s was found running', pid)
-
-        if process and only_children is False:
-            try:
-                cmdline = process.cmdline()
-            except psutil.AccessDenied:
-                # macOS denies us access to the above information
-                cmdline = None
-            if not cmdline:
-                try:
-                    cmdline = process.as_dict()
-                except psutil.NoSuchProcess as exc:
-                    log.debug('No such process found. Stacktrace: {0}'.format(exc))
-
-            if psutil.pid_exists(pid):
-                log.info('Terminating process: %s', cmdline)
-                process.terminate()
-                try:
-                    process.wait(timeout=10)
-                except psutil.TimeoutExpired:
-                    pass
-
-            if psutil.pid_exists(pid):
-                log.warning('Killing process: %s', cmdline)
-                process.kill()
-
-            if psutil.pid_exists(pid):
-                log.warning('Process left behind which we were unable to kill: %s', cmdline)
-        if children:
-            # Lets log and kill any child processes which salt left behind
-            def kill_children(_children, kill=False):
-                for child in _children[:][::-1]:  # Iterate over a reversed copy of the list
-                    try:
-                        if not kill and child.status() == psutil.STATUS_ZOMBIE:
-                            # Zombie processes will exit once child processes also exit
-                            continue
-                        try:
-                            cmdline = child.cmdline()
-                        except psutil.AccessDenied as err:
-                            log.debug('Cannot obtain child process cmdline: %s', err)
-                            cmdline = ''
-                        if not cmdline:
-                            cmdline = child.as_dict()
-                        if kill:
-                            log.warning('Killing child process left behind: %s', cmdline)
-                            child.kill()
-                        else:
-                            log.warning('Terminating child process left behind: %s', cmdline)
-                            child.terminate()
-                        if not psutil.pid_exists(child.pid):
-                            _children.remove(child)
-                    except psutil.NoSuchProcess:
-                        _children.remove(child)
-            try:
-                kill_children([child for child in children if child.is_running()
-                               and not any(sys.argv[0] in cmd for cmd in child.cmdline())])
-            except psutil.AccessDenied:
-                # OSX denies us access to the above information
-                kill_children(children)
-
-            if children:
-                psutil.wait_procs(children, timeout=3, callback=lambda proc: kill_children(children, kill=True))
-
-            if children:
-                psutil.wait_procs(children, timeout=1, callback=lambda proc: kill_children(children, kill=True))
 
 RUNTIME_CONFIGS = {}
 
@@ -1829,67 +1741,6 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase, ScriptPathMixi
                                timeout=timeout)
 
 
-class ShellCaseCommonTestsMixIn(CheckShellBinaryNameAndVersionMixIn):
-
-    _call_binary_expected_version_ = salt.version.__version__
-
-    def test_salt_with_git_version(self):
-        if getattr(self, '_call_binary_', None) is None:
-            self.skipTest('\'_call_binary_\' not defined.')
-        from salt.utils import which
-        from salt.version import __version_info__, SaltStackVersion
-        git = which('git')
-        if not git:
-            self.skipTest('The git binary is not available')
-
-        # Let's get the output of git describe
-        process = subprocess.Popen(
-            [git, 'describe', '--tags', '--first-parent', '--match', 'v[0-9]*'],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            close_fds=True,
-            cwd=CODE_DIR
-        )
-        out, err = process.communicate()
-        if process.returncode != 0:
-            process = subprocess.Popen(
-                [git, 'describe', '--tags', '--match', 'v[0-9]*'],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                close_fds=True,
-                cwd=CODE_DIR
-            )
-            out, err = process.communicate()
-        if not out:
-            self.skipTest(
-                'Failed to get the output of \'git describe\'. '
-                'Error: \'{0}\''.format(
-                    salt.utils.to_str(err)
-                )
-            )
-
-        parsed_version = SaltStackVersion.parse(out)
-
-        if parsed_version.info < __version_info__:
-            self.skipTest(
-                'We\'re likely about to release a new version. This test '
-                'would fail. Parsed(\'{0}\') < Expected(\'{1}\')'.format(
-                    parsed_version.info, __version_info__
-                )
-            )
-        elif parsed_version.info != __version_info__:
-            self.skipTest(
-                'In order to get the proper salt version with the '
-                'git hash you need to update salt\'s local git '
-                'tags. Something like: \'git fetch --tags\' or '
-                '\'git fetch --tags upstream\' if you followed '
-                'salt\'s contribute documentation. The version '
-                'string WILL NOT include the git hash.'
-            )
-        out = '\n'.join(self.run_script(self._call_binary_, '--version'))
-        self.assertIn(parsed_version.string, out)
-
-
 @requires_sshd_server
 class SSHCase(ShellCase):
     '''

tests/integration/cli/test_batch.py

@@ -6,7 +6,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/cli/test_grains.py

@@ -21,7 +21,7 @@ import integration
 import salt.utils
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/client/test_kwarg.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/client/test_runner.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 
 # Import Salt Testing libs
 import integration
-from salttesting import skipIf
+from tests.support.unit import skipIf
 
 # Import Salt libs
 import salt.runner

tests/integration/client/test_standard.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/client/test_syndic.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/cloud/helpers/virtualbox.py

@@ -8,7 +8,7 @@ import os
 import unittest
 
 # Import Salt Testing libs
-from salttesting import skipIf
+from tests.support.unit import skipIf
 
 # Import Salt libs
 import salt.ext.six as six

tests/integration/cloud/providers/test_digital_ocean.py

@@ -10,7 +10,7 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_ec2.py

@@ -14,7 +14,7 @@ import integration
 from salt.config import cloud_providers_config
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_gce.py

@@ -15,7 +15,7 @@ import integration
 from salt.config import cloud_providers_config
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_gogrid.py

@@ -10,8 +10,8 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
-from salttesting import skipIf
+from tests.support.helpers import ensure_in_syspath, expensiveTest
+from tests.support.unit import skipIf
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_joyent.py

@@ -10,7 +10,7 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_linode.py

@@ -10,7 +10,7 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_msazure.py

@@ -11,8 +11,8 @@ import string
 from distutils.version import LooseVersion
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_openstack.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import logging
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath
 )

tests/integration/cloud/providers/test_profitbricks.py

@@ -10,8 +10,8 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_rackspace.py

@@ -10,8 +10,8 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/cloud/providers/test_virtualbox.py

@@ -10,8 +10,8 @@ import logging
 import socket
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 
 from integration.cloud.helpers.virtualbox import VirtualboxTestCase, VirtualboxCloudTestCase, CONFIG_NAME, \
     PROVIDER_NAME, \

tests/integration/cloud/providers/test_vultr.py

@@ -11,7 +11,7 @@ import string
 import time
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath, expensiveTest
+from tests.support.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
 

tests/integration/fileserver/test_fileclient.py

@@ -12,9 +12,9 @@ import shutil
 log = logging.getLogger(__name__)
 
 # Import Salt Testing libs
-from salttesting.unit import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
-from salttesting.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
+from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
 ensure_in_syspath('../..')
 
 # Import salt libs

tests/integration/fileserver/test_gitfs.py

@@ -10,9 +10,9 @@ import pwd
 import shutil
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
-from salttesting.mock import patch, NO_MOCK, NO_MOCK_REASON
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
+from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
 
 ensure_in_syspath('../..')
 

tests/integration/fileserver/test_roots.py

@@ -8,9 +8,9 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
-from salttesting.mock import patch, NO_MOCK, NO_MOCK_REASON
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
+from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
 ensure_in_syspath('../..')
 
 # Import salt libs

tests/integration/grains/test_core.py

@@ -7,8 +7,8 @@ Test the core grains
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/loader/test_ext_grains.py

@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.unit import skipIf
+from tests.support.unit import skipIf
 
 # Import salt libs
 import integration

tests/integration/loader/test_ext_modules.py

@@ -13,7 +13,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../')
 
 # Import salt libs

tests/integration/loader/test_globals.py

@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/loader/test_interfaces.py

@@ -10,8 +10,8 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import TestCase
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import TestCase
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/loader/test_loader.py

@@ -18,8 +18,8 @@ import collections
 log = logging.getLogger(__name__)
 
 # Import Salt Testing libs
-from salttesting import TestCase
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import TestCase
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/minion/test_blackout.py

@@ -10,7 +10,7 @@ from time import sleep
 import textwrap
 
 # Import Salt Testing libs
-from salttesting.helpers import destructiveTest, ensure_in_syspath
+from tests.support.helpers import destructiveTest, ensure_in_syspath
 
 ensure_in_syspath('../')
 

tests/integration/minion/test_pillar.py

@@ -5,9 +5,9 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, requires_system_grains
-from salttesting.mock import NO_MOCK, NO_MOCK_REASON
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, requires_system_grains
+from tests.support.mock import NO_MOCK, NO_MOCK_REASON
 
 ensure_in_syspath('../..')
 
@@ -24,7 +24,7 @@ from subprocess import Popen, PIPE, STDOUT
 log = logging.getLogger(__name__)
 
 # Import 3rd-party libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('..')
 import salt.ext.six as six
 

tests/integration/minion/test_timeout.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import
 
 # Import Salt Testing libs
 import integration
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../')
 

tests/integration/modules/test_aliases.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_archive.py

@@ -9,8 +9,8 @@ import shutil
 import textwrap
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath
 )

tests/integration/modules/test_beacons.py

@@ -13,7 +13,7 @@ import integration
 import salt.utils
 
 # Salttesting libs
-from salttesting import skipIf
+from tests.support.unit import skipIf
 
 
 BEACON_CONF_DIR = os.path.join(integration.TMP, 'minion.d')

tests/integration/modules/test_boto_iam.py

@@ -7,8 +7,8 @@ Validate the boto_iam module
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import Salt libs

tests/integration/modules/test_boto_sns.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import re
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import Salt libs

tests/integration/modules/test_cmdmod.py

@@ -8,13 +8,13 @@ import textwrap
 import tempfile
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     skip_if_binaries_missing
 )
-from salttesting.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch
+from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_config.py

@@ -7,7 +7,7 @@ Validate the config system
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_cp.py

@@ -8,7 +8,7 @@ import hashlib
 import tempfile
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_darwin_sysctl.py

@@ -15,8 +15,8 @@ import salt.utils.files
 from salt.exceptions import CommandExecutionError
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_data.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_decorators.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_disk.py

@@ -6,8 +6,8 @@ import os
 import shutil
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (ensure_in_syspath, destructiveTest)
+from tests.support.unit import skipIf
+from tests.support.helpers import (ensure_in_syspath, destructiveTest)
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_django.py

@@ -6,9 +6,9 @@ Test the django module
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
-from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
+from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_event.py

@@ -13,7 +13,7 @@ import time
 import threading
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_file.py

@@ -10,9 +10,9 @@ import shutil
 import sys
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
-from salttesting.mock import patch, MagicMock
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
+from tests.support.mock import patch, MagicMock
 
 ensure_in_syspath('../../')
 

tests/integration/modules/test_gem.py

@@ -7,8 +7,8 @@ Integration tests for Ruby Gem module
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_gentoolkitmod.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_git.py

@@ -21,8 +21,8 @@ import tempfile
 
 # Import Salt Testing libs
 from distutils.version import LooseVersion
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     skip_if_binaries_missing

tests/integration/modules/test_grains.py

@@ -9,8 +9,8 @@ import os
 import time
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import destructiveTest, ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import destructiveTest, ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/modules/test_groupadd.py

@@ -6,7 +6,7 @@ import string
 import random
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_hosts.py

@@ -8,7 +8,7 @@ import os
 import shutil
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_key.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 import re
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_linux_acl.py

@@ -6,7 +6,7 @@ import os
 import shutil
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, skip_if_binaries_missing
+from tests.support.helpers import ensure_in_syspath, skip_if_binaries_missing
 import salt.utils
 ensure_in_syspath('../../')
 

tests/integration/modules/test_locale.py

@@ -4,8 +4,8 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     ensure_in_syspath,
     requires_salt_modules,
     requires_system_grains,

tests/integration/modules/test_lxc.py

@@ -8,12 +8,12 @@ Test the lxc module
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import (
+from tests.support.helpers import (
     ensure_in_syspath,
     skip_if_not_root,
     skip_if_binaries_missing
 )
-from salttesting import skipIf
+from tests.support.unit import skipIf
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mac_assistive.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_mac_brew.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
 )

tests/integration/modules/test_mac_defaults.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_mac_desktop.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_mac_group.py

@@ -10,8 +10,8 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_mac_keychain.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_mac_pkgutil.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mac_ports.py

@@ -7,7 +7,7 @@ integration tests for mac_ports
 from __future__ import absolute_import, print_function
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mac_power.py

@@ -7,8 +7,8 @@ integration tests for mac_power
 from __future__ import absolute_import, print_function
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 
 # Import salt libs
 import integration

tests/integration/modules/test_mac_service.py

@@ -7,8 +7,8 @@ integration tests for mac_service
 from __future__ import absolute_import, print_function
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mac_shadow.py

@@ -10,7 +10,7 @@ import random
 import string
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 from salt.ext.six.moves import range
 ensure_in_syspath('../../')
 

tests/integration/modules/test_mac_softwareupdate.py

@@ -7,7 +7,7 @@ integration tests for mac_softwareupdate
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mac_system.py

@@ -9,8 +9,8 @@ import random
 import string
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 from salt.ext.six.moves import range
 ensure_in_syspath('../../')
 

tests/integration/modules/test_mac_timezone.py

@@ -15,8 +15,8 @@ from __future__ import absolute_import
 import datetime
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mac_user.py

@@ -10,8 +10,8 @@ import random
 import string
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_mac_xattr.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mine.py

@@ -7,7 +7,7 @@ from __future__ import absolute_import
 import time
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_mysql.py

@@ -5,8 +5,8 @@ from __future__ import absolute_import
 import logging
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath
 )

tests/integration/modules/test_nilrt_ip.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import time
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_pillar.py

@@ -5,8 +5,8 @@ from __future__ import absolute_import
 from distutils.version import LooseVersion  # pylint: disable=import-error,no-name-in-module
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     ensure_in_syspath,
     requires_network
 )

tests/integration/modules/test_pip.py

@@ -15,8 +15,8 @@ import re
 import tempfile
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_pkg.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import (
+from tests.support.helpers import (
     destructiveTest,
     requires_network,
     requires_salt_modules,

tests/integration/modules/test_publish.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import, print_function
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_pw_user.py

@@ -12,8 +12,8 @@ import string
 import random
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import destructiveTest, ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import destructiveTest, ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_rabbitmq.py

@@ -5,8 +5,8 @@ from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, requires_salt_modules
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, requires_salt_modules
 
 ensure_in_syspath('../../')
 

tests/integration/modules/test_random_org.py

@@ -7,13 +7,13 @@
 from __future__ import absolute_import
 
 # Import Salt Testing Libs
-from salttesting import TestCase, skipIf
-from salttesting.mock import (
+from tests.support.unit import TestCase, skipIf
+from tests.support.mock import (
     NO_MOCK,
     NO_MOCK_REASON
 )
 
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/modules/test_saltutil.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import
 import time
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../')
 

tests/integration/modules/test_shadow.py

@@ -10,8 +10,8 @@ import string
 import os
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, destructiveTest
 from salt.ext.six.moves import range
 ensure_in_syspath('../../')
 

tests/integration/modules/test_ssh.py

@@ -9,8 +9,8 @@ import os
 import shutil
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath, skip_if_binaries_missing
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath, skip_if_binaries_missing
 ensure_in_syspath('../../')
 
 

tests/integration/modules/test_state.py

@@ -9,8 +9,8 @@ import threading
 import time
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_supervisord.py

@@ -7,8 +7,8 @@ import time
 import subprocess
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_sysctl.py

@@ -5,8 +5,8 @@ from __future__ import absolute_import
 import sys
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_sysmod.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_system.py

@@ -9,8 +9,8 @@ import signal
 import subprocess
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath
 )

tests/integration/modules/test_test.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_timezone.py

@@ -9,7 +9,7 @@ Linux and Solaris are supported
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_useradd.py

@@ -7,8 +7,8 @@ import string
 import random
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import (
+from tests.support.unit import skipIf
+from tests.support.helpers import (
     destructiveTest,
     ensure_in_syspath,
     requires_system_grains

tests/integration/modules/test_virt.py

@@ -7,7 +7,7 @@ Validate the virt module
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting.helpers import ensure_in_syspath, requires_salt_modules
+from tests.support.helpers import ensure_in_syspath, requires_salt_modules
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/modules/test_virtualenv.py

@@ -6,8 +6,8 @@ import os
 import tempfile
 
 # Import Salt Testing libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 ensure_in_syspath('../../')
 
 # Import salt libs

tests/integration/netapi/rest_cherrypy/test_app_pam.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import
 import os
 
 # Import salttesting libs
-from salttesting.unit import skipIf
-from salttesting.helpers import destructiveTest
+from tests.support.unit import skipIf
+from tests.support.helpers import destructiveTest
 
 # Import test support libs
 import tests.support.cherrypy_testclasses as cptc

tests/integration/netapi/rest_tornado/test_app.py

@@ -12,8 +12,8 @@ from salt.netapi.rest_tornado import saltnado
 from unit.netapi.rest_tornado.test_handlers import SaltnadoTestCase
 
 # Import Salt Testing Libs
-from salttesting import skipIf
-from salttesting.helpers import ensure_in_syspath
+from tests.support.unit import skipIf
+from tests.support.helpers import ensure_in_syspath
 
 ensure_in_syspath('../../../')
 

tests/integration/netapi/test_client.py

@@ -6,7 +6,7 @@ import os
 
 # Import Salt Testing libs
 from integration import TMP_CONF_DIR
-from salttesting import TestCase
+from tests.support.unit import TestCase
 
 # Import Salt libs
 import salt.config

tests/integration/output/test_output.py

@@ -9,8 +9,8 @@ import os
 import traceback
 
 # Import Salt Testing Libs
-from salttesting.helpers import ensure_in_syspath
-from salttesting.mixins import RUNTIME_VARS
+from tests.support.helpers import ensure_in_syspath
+from tests.support.mixins import RUNTIME_VARS
 
 ensure_in_syspath('../../')