Add from __future__ import absolute_import

tests/buildpackage.py

@@ -10,6 +10,7 @@
 
 # pylint: disable=file-perms
 
+from __future__ import absolute_import
 import errno
 import glob
 import logging

tests/eventlisten.py

@@ -8,7 +8,7 @@ This script is a generic tool to test event output
 '''
 
 # Import Python libs
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 import optparse
 import pprint
 import time

tests/integration/__init__.py

@@ -5,7 +5,7 @@ Set up the Salt integration test suite
 '''
 
 # Import Python libs
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 import os
 import re
 import sys

tests/integration/cli/batch.py

@@ -2,6 +2,8 @@
 '''
     :codeauthor: :email:`Nicole Thomas <nicole@saltstack.com>`
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Libs
 import integration

tests/integration/cli/custom_module.py

@@ -34,6 +34,8 @@
 
     $ python tests/runtests.py -C --ssh
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Libs
 import integration

tests/integration/cli/grains.py

@@ -12,6 +12,8 @@
     localhost:
         localhost
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Libs
 import integration

tests/integration/client/kwarg.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/client/runner.py

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+# Import python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 import integration
 

tests/integration/client/standard.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/client/syndic.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/cloud/providers/digital_ocean.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/cloud/providers/ec2.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/cloud/providers/gogrid.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs

tests/integration/cloud/providers/linode.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/cloud/providers/msazure.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/cloud/providers/rackspace.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/files/extension_modules/pillar/test_ext_pillar_opts.py

@@ -8,6 +8,7 @@ _virtual__ with the value __opts__
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import logging
 
 # Set up logging

tests/integration/files/extension_modules/tops/master_tops_test.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 import logging
 
 

tests/integration/files/file/base/_modules/override_test.py

@@ -2,6 +2,7 @@
 '''
 Module for running arbitrary tests
 '''
+from __future__ import absolute_import
 
 __virtualname__ = 'test'
 

tests/integration/files/file/base/_modules/runtests_decorators.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
-import salt.utils.decorators
+# Import Python libs
+from __future__ import absolute_import
 import time
 
+# Import Salt libs
+import salt.utils.decorators
+
 
 def _fallbackfunc():
     return False, 'fallback'

tests/integration/files/file/base/_modules/runtests_helpers.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import tempfile
 

tests/integration/files/file/base/_modules/salttest.py

@@ -3,6 +3,9 @@
 Module for running arbitrary tests
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 
 def jinja_error():
     '''

tests/integration/files/file/base/_states/salttest.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
 __docformat__ = 'restructuredtext en'
 
 

tests/integration/fileserver/fileclient_test.py

@@ -2,6 +2,8 @@
 '''
     :codeauthor: :email:`Mike Place <mp@saltstack.com>`
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Testing libs
 from salttesting.unit import skipIf

tests/integration/fileserver/gitfs_test.py

@@ -2,6 +2,13 @@
 '''
     :codeauthor: :email:`Mike Place <mp@saltstack.com>`
 '''
+# Import Python libs
+from __future__ import absolute_import
+import copy
+import os
+import logging
+import pwd
+import shutil
 
 # Import Salt Testing libs
 from salttesting import skipIf
@@ -10,13 +17,6 @@ from salttesting.mock import patch, NO_MOCK, NO_MOCK_REASON
 
 ensure_in_syspath('../..')
 
-# Import Python libs
-import copy
-import os
-import logging
-import pwd
-import shutil
-
 # Import salt libs
 import integration
 from salt.fileserver import gitfs

tests/integration/fileserver/roots_test.py

@@ -3,6 +3,10 @@
     :codeauthor: :email:`Mike Place <mp@saltstack.com>`
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+import os
+
 # Import Salt Testing libs
 from salttesting import skipIf
 from salttesting.helpers import ensure_in_syspath
@@ -16,9 +20,6 @@ from salt import fileclient
 
 roots.__opts__ = {}
 
-# Import Python libs
-import os
-
 
 @skipIf(NO_MOCK, NO_MOCK_REASON)
 class RootsTest(integration.ModuleCase):

tests/integration/loader/ext_modules.py

@@ -9,6 +9,9 @@
     Test Salt's loader regarding external overrides
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../')

tests/integration/loader/globals.py

@@ -6,6 +6,9 @@
     Test Salt's loader regarding globals that it should pack in
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../')

tests/integration/modules/aliases.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/brew.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing Libs

tests/integration/modules/cmdmod.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import sys
 import tempfile

tests/integration/modules/config.py

@@ -3,6 +3,9 @@
 '''
 Validate the config system
 '''
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/cp.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import hashlib
 

tests/integration/modules/darwin_sysctl.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 

tests/integration/modules/data.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/decorators.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/disk.py

@@ -1,5 +1,10 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+import os
+import shutil
+
 # Import Salt Testing libs
 from salttesting.helpers import (ensure_in_syspath, destructiveTest)
 ensure_in_syspath('../../')
@@ -9,10 +14,6 @@ import integration
 import salt.utils
 from salttesting import skipIf
 
-# Import Python libs
-import os
-import shutil
-
 
 class DiskModuleVirtualizationTest(integration.ModuleCase):
     '''

tests/integration/modules/django.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
-
 '''
 Test the django module
 '''
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting import skipIf
 from salttesting.helpers import ensure_in_syspath

tests/integration/modules/dockertest.py

@@ -6,6 +6,7 @@ Tests for integration with Docker's Python library
 __author__ = 'cro'
 
 # Import python libs
+from __future__ import absolute_import
 import string
 import os
 

tests/integration/modules/event.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import time
 import threading
 from Queue import Queue, Empty

tests/integration/modules/file.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import getpass
 import grp
 import pwd

tests/integration/modules/git.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import Python Libs
+from __future__ import absolute_import
 import shutil
 import subprocess
 import tempfile

tests/integration/modules/grains.py

@@ -4,6 +4,7 @@
 Test the grains module
 '''
 # Import python libs
+from __future__ import absolute_import
 import os
 import time
 

tests/integration/modules/hosts.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-
 '''
 Test the hosts module
 '''
 # Import python libs
+from __future__ import absolute_import
 import os
 import shutil
 

tests/integration/modules/linux_acl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import shutil
 

tests/integration/modules/lxc.py

@@ -4,6 +4,9 @@
 Test the lxc module
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath, skip_if_not_root, skip_if_binaries_missing
 ensure_in_syspath('../../')

tests/integration/modules/mac_group.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/modules/mac_user.py

@@ -4,6 +4,7 @@
 '''
 
 # Import Python Libs
+from __future__ import absolute_import
 import os
 import random
 import string

tests/integration/modules/mine.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
-
 '''
 Test the salt mine system
 '''
+# Import Pytohn libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/mysql.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import logging
 
 # Import Salt Testing libs

tests/integration/modules/pillar.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import
-
 # Import Python Libs
+from __future__ import absolute_import
 from distutils.version import LooseVersion  # pylint: disable=import-error,no-name-in-module
 
 # Import Salt Testing libs

tests/integration/modules/pip.py

@@ -7,6 +7,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import pwd
 import shutil

tests/integration/modules/publish.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/pw_user.py

@@ -5,9 +5,8 @@
     tests.integration.modules.pw_user
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 '''
-
-
 # Import python libs
+from __future__ import absolute_import
 import os
 import string
 import random

tests/integration/modules/rabbitmq.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/modules/ssh.py

@@ -4,6 +4,7 @@
 Test the ssh module
 '''
 # Import python libs
+from __future__ import absolute_import
 import os
 import shutil
 

tests/integration/modules/state.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import shutil
 

tests/integration/modules/supervisord.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python
+from __future__ import absolute_import
 import os
 import time
 import subprocess

tests/integration/modules/sysctl.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import sys
 
 # Import Salt Testing libs

tests/integration/modules/sysmod.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import re
 
 # Import Salt Testing libs

tests/integration/modules/test.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/modules/useradd.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import string
 import random

tests/integration/modules/virt.py

@@ -3,6 +3,9 @@
 Validate the virt module
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath, requires_salt_modules
 ensure_in_syspath('../../')

tests/integration/modules/virtualenv.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import tempfile
 

tests/integration/netapi/rest_cherrypy/test_app.py

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+# Import python libs
+from __future__ import absolute_import
+
 # Import salttesting libs
 from salttesting import mock
 from salttesting.unit import skipIf

tests/integration/netapi/rest_tornado/test_app.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import Python Libs
+from __future__ import absolute_import
 import json
 import time
 

tests/integration/netapi/test_client.py

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 # Import Python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/output/output.py

@@ -4,17 +4,19 @@
 '''
 
 # Import Salt Libs
-import traceback
-import integration
+from __future__ import absolute_import
 import os
 import copy
-from salt.output import display_output
+import traceback
 
 # Import Salt Testing Libs
 from salttesting.helpers import ensure_in_syspath
-
 ensure_in_syspath('../../')
 
+# Import Salt libs
+from salt.output import display_output
+import integration
+
 
 class OutputReturnTest(integration.ShellCase):
     '''

tests/integration/runners/fileserver.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the fileserver runner
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath

tests/integration/runners/jobs.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the salt-run command
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath

tests/integration/runners/manage.py

@@ -2,6 +2,9 @@
 '''
 Tests for the salt-run command
 '''
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/runners/state.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the salt-run command
 '''
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/shell/arguments.py

@@ -3,6 +3,9 @@
     Test Salt's argument parser
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath, requires_salt_modules
 

tests/integration/shell/auth.py

@@ -5,6 +5,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import pwd
 import random

tests/integration/shell/call.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import sys
 import re

tests/integration/shell/cloud.py

@@ -8,6 +8,8 @@
     :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
 '''
 
+# Import Python libs
+from __future__ import absolute_import
 
 # Import salt testing libs
 from salttesting.unit import skipIf

tests/integration/shell/cp.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import pipes

tests/integration/shell/key.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import shutil

tests/integration/shell/master.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import signal

tests/integration/shell/master_tops.py

@@ -4,6 +4,9 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/shell/matcher.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import shutil

tests/integration/shell/minion.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import signal

tests/integration/shell/runner.py

@@ -5,6 +5,7 @@ Tests for the salt-run command
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import shutil

tests/integration/shell/syndic.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import yaml
 import signal

tests/integration/ssh/deploy.py

@@ -2,8 +2,16 @@
 '''
 salt-ssh testing
 '''
+# Import Python libs
+from __future__ import absolute_import
+
+# Import salttesting libs
+from salttesting.unit import skipIf
+from salttesting.helpers import ensure_in_syspath
+ensure_in_syspath('../../')
+
+# Import Salt libs
 import integration
-from salttesting import skipIf
 
 
 @skipIf(True, 'Not ready for production')

tests/integration/states/cmd.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the file state
 '''
-
 # Import python libs
+from __future__ import absolute_import
 import tempfile
 
 # Import Salt Testing libs

tests/integration/states/compiler.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-
 '''
 tests for host state
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/states/file.py

@@ -5,6 +5,7 @@ Tests for the file state
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import glob
 import grp
 import os

tests/integration/states/git.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the Git state
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import shutil
 import socket

tests/integration/states/handle_error.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-
 '''
 tests for host state
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/states/handle_iorder.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-
 '''
 tests for host state
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting.helpers import ensure_in_syspath
 ensure_in_syspath('../../')

tests/integration/states/host.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-
 '''
 tests for host state
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import shutil
 

tests/integration/states/match.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/states/mysql.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the MySQL states
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import logging
 
-
 # Import Salt Testing libs
 from salttesting import skipIf
 from salttesting.helpers import (

tests/integration/states/npm.py

@@ -4,6 +4,8 @@
     tests.integration.states.npm
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 '''
+# Import Python libs
+from __future__ import absolute_import
 
 # Import Salt Testing libs
 from salttesting import skipIf

tests/integration/states/pip.py

@@ -8,6 +8,7 @@
 '''
 
 # Import python libs
+from __future__ import absolute_import
 import os
 import pwd
 import glob

tests/integration/states/pkg.py

@@ -3,6 +3,10 @@
 '''
 tests for pkg state
 '''
+# Import python libs
+from __future__ import absolute_import
+import os
+import time
 
 # Import Salt Testing libs
 from salttesting import skipIf
@@ -14,10 +18,6 @@ from salttesting.helpers import (
 )
 ensure_in_syspath('../../')
 
-# Import python libs
-import os
-import time
-
 # Import salt libs
 import integration
 import salt.utils

tests/integration/states/pkgrepo.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-
 '''
 tests for pkgrepo states
 '''
 
+# Import Python libs
+from __future__ import absolute_import
+
 # Import Salt Testing libs
 from salttesting import skipIf
 from salttesting.helpers import (

tests/integration/states/rabbitmq_user.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-
 '''
 Tests for the rabbitmq state
 '''
-
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs

tests/integration/states/rabbitmq_vhost.py

@@ -3,8 +3,8 @@
 '''
 Tests for the rabbitmq state
 '''
-
 # Import python libs
+from __future__ import absolute_import
 import os
 
 # Import Salt Testing libs