saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

By these days, we should blowup if mock is not available

Browse source
This commit is contained in:
Pedro Algarvio 2019-07-17 15:46:05 +01:00
parent 23da8fc6be
commit ba94b4b878
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
591 changed files with 641 additions and 2369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
templates/test_module/tests/unit/modules/test_{{module_name}}.py
View file

@ -8,16 +8,11 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import (
patch,
NO_MOCK,
NO_MOCK_REASON
)
from tests.support.unit import TestCase
from tests.support.mock import patch
import salt.modules.{{module_name}} as {{module_name}}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class {{module_name|capitalize}}TestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

10
templates/test_state/tests/unit/states/test_{{module_name}}.py
View file

@ -8,17 +8,11 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import (
patch,
NO_MOCK,
NO_MOCK_REASON
)
from tests.support.unit import TestCase
from tests.support.mock import patch
import salt.states.{{module_name}} as {{module_name}}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class {{module_name|capitalize}}TestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

7
tests/integration/pillar/test_git_pillar.py
View file

@ -81,7 +81,6 @@ from tests.support.helpers import (
requires_system_grains,
skip_if_not_root
)
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.unit import skipIf
# Import Salt libs
@ -517,7 +516,6 @@ class GitPythonMixin(object):
@destructiveTest
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(_windows_or_mac(), 'minion is windows or mac')
@skip_if_not_root
@skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER))
@ -532,7 +530,6 @@ class TestGitPythonSSH(GitPillarSSHTestBase, GitPythonMixin):
passphrase = PASSWORD
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(_windows_or_mac(), 'minion is windows or mac')
@skip_if_not_root
@skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER))
@ -545,7 +542,6 @@ class TestGitPythonHTTP(GitPillarHTTPTestBase, GitPythonMixin):
pass
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(_windows_or_mac(), 'minion is windows or mac')
@skip_if_not_root
@skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER))
@ -581,7 +577,6 @@ class TestGitPythonAuthenticatedHTTP(TestGitPythonHTTP, GitPythonMixin):
@destructiveTest
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(_windows_or_mac(), 'minion is windows or mac')
@skip_if_not_root
@skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER))
@ -1867,7 +1862,6 @@ class TestPygit2SSH(GitPillarSSHTestBase):
self.assertEqual(ret, expected)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(_windows_or_mac(), 'minion is windows or mac')
@skip_if_not_root
@skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER))
@ -2271,7 +2265,6 @@ class TestPygit2HTTP(GitPillarHTTPTestBase):
)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(_windows_or_mac(), 'minion is windows or mac')
@skip_if_not_root
@skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER))

5
tests/support/mixins.py
View file

@ -26,7 +26,7 @@ import subprocess
import multiprocessing
# Import Salt Testing Libs
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch
from tests.support.mock import patch
from tests.support.runtests import RUNTIME_VARS
from tests.support.paths import CODE_DIR
@ -423,9 +423,6 @@ class LoaderModuleMockMixin(six.with_metaclass(_FixLoaderModuleMockMixinMroOrder
@functools.wraps(setup_func)
def wrapper(self):
if NO_MOCK:
self.skipTest(NO_MOCK_REASON)
loader_modules_configs = self.setup_loader_modules()
if not isinstance(loader_modules_configs, dict):
raise RuntimeError(

87
tests/support/mock.py
View file

@ -25,75 +25,26 @@ import sys
from salt.ext import six
import salt.utils.stringutils
try:
from mock import (
Mock,
MagicMock,
patch,
sentinel,
DEFAULT,
# ANY and call will be imported further down
create_autospec,
FILTER_DIR,
NonCallableMock,
NonCallableMagicMock,
PropertyMock,
__version__
)
NO_MOCK = False
NO_MOCK_REASON = ''
mock_version = []
for __part in __version__.split('.'):
try:
mock_version.append(int(__part))
except ValueError:
# Non-integer value (ex. '1a')
mock_version.append(__part)
mock_version = tuple(mock_version)
except ImportError as exc:
NO_MOCK = True
NO_MOCK_REASON = 'mock python module is unavailable'
mock_version = (0, 0, 0)
# By these days, we should blowup if mock is not available
import mock # pylint: disable=blacklisted-external-import
__mock_version = tuple([int(part) for part in mock.__version__.split('.') if part.isdigit()]) # pylint: disable=no-member
if sys.version_info < (3, 6) and __mock_version < (2,):
# We need mock >= 2.0.0 before Py3.6
raise ImportError('Please install mock>=2.0.0')
# Let's not fail on imports by providing fake objects and classes
class MagicMock(object):
# __name__ can't be assigned a unicode
__name__ = str('{0}.fakemock').format(__name__) # future lint: disable=blacklisted-function
def __init__(self, *args, **kwargs):
pass
def dict(self, *args, **kwargs):
return self
def multiple(self, *args, **kwargs):
return self
def __call__(self, *args, **kwargs):
return self
Mock = MagicMock
patch = MagicMock()
sentinel = object()
DEFAULT = object()
create_autospec = MagicMock()
FILTER_DIR = True
NonCallableMock = MagicMock()
NonCallableMagicMock = MagicMock()
mock_open = object()
PropertyMock = object()
call = tuple
ANY = object()
if NO_MOCK is False:
try:
from mock import call, ANY
except ImportError:
NO_MOCK = True
NO_MOCK_REASON = 'you need to upgrade your mock version to >= 0.8.0'
from mock import (Mock, # pylint: disable=no-name-in-module,no-member
MagicMock,
patch,
sentinel,
DEFAULT,
create_autospec,
FILTER_DIR,
NonCallableMock,
NonCallableMagicMock,
PropertyMock,
__version__,
ANY,
call)
class MockFH(object):

3
tests/unit/auth/test_ldap.py
View file

@ -7,7 +7,7 @@ from __future__ import absolute_import
import salt.auth.ldap
# Import Salt Testing Libs
from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
from tests.support.mock import patch
from tests.support.unit import skipIf, TestCase
salt.auth.ldap.__opts__ = {}
@ -28,7 +28,6 @@ class Bind(object):
]
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not salt.auth.ldap.HAS_LDAP, 'Install python-ldap for this test')
class LDAPAuthTestCase(TestCase):
'''

5
tests/unit/beacons/test_adb.py
View file

@ -4,15 +4,14 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, Mock
from tests.support.unit import TestCase
from tests.support.mock import patch, Mock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
import salt.beacons.adb as adb
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ADBBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.adb

4
tests/unit/beacons/test_avahi_announce.py
View file

@ -4,15 +4,13 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
import salt.beacons.avahi_announce as avahi_announce
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AvahiAnnounceBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.avahi_announce

4
tests/unit/beacons/test_bonjour_announce.py
View file

@ -4,15 +4,13 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
import salt.beacons.bonjour_announce as bonjour_announce
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BonjourAnnounceBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.avahi_announce

3
tests/unit/beacons/test_btmp.py
View file

@ -7,7 +7,7 @@ import logging
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, mock_open
from tests.support.mock import patch, MagicMock, mock_open
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -27,7 +27,6 @@ pack = (6, 29774, b'ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0
log = logging.getLogger(__name__)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BTMPBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.[s]

5
tests/unit/beacons/test_diskusage.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import
from collections import namedtuple
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, Mock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock, Mock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -48,7 +48,6 @@ WINDOWS_STUB_DISK_USAGE = namedtuple('usage',
50)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.adb

5
tests/unit/beacons/test_glxinfo.py
View file

@ -7,14 +7,13 @@ from __future__ import absolute_import
import salt.beacons.glxinfo as glxinfo
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, Mock
from tests.support.unit import TestCase
from tests.support.mock import patch, Mock
# Import test suite libs
from tests.support.mixins import LoaderModuleMockMixin
@skipIf(NO_MOCK, NO_MOCK_REASON)
class GLXInfoBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.glxinfo

5
tests/unit/beacons/test_haproxy.py
View file

@ -4,15 +4,14 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
import salt.beacons.haproxy as haproxy
@skipIf(NO_MOCK, NO_MOCK_REASON)
class HAProxyBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.haproxy

5
tests/unit/beacons/test_journald.py
View file

@ -6,8 +6,8 @@ import datetime
from uuid import UUID
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock
from tests.support.unit import TestCase
from tests.support.mock import Mock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -74,7 +74,6 @@ class SystemdJournaldMock(Mock):
SYSTEMD_MOCK = SystemdJournaldMock()
@skipIf(NO_MOCK, NO_MOCK_REASON)
class JournaldBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.journald

3
tests/unit/beacons/test_load.py
View file

@ -5,7 +5,7 @@ from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -16,7 +16,6 @@ import logging
log = logging.getLogger(__name__)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class LoadBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.load

5
tests/unit/beacons/test_log.py
View file

@ -4,8 +4,8 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, mock_open
from tests.support.unit import TestCase
from tests.support.mock import patch, mock_open
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -20,7 +20,6 @@ _STUB_LOG_ENTRY = 'Jun 29 12:58:51 hostname sshd[6536]: ' \
'for user username by (uid=0)\n'
@skipIf(NO_MOCK, NO_MOCK_REASON)
class LogBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.log

5
tests/unit/beacons/test_memusage.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import
from collections import namedtuple
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -18,7 +18,6 @@ STUB_MEMORY_USAGE = namedtuple('vmem', 'total available percent used free active
1156378624, 4750528512, 898908160)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class MemUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.memusage

5
tests/unit/beacons/test_network_info.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import
from collections import namedtuple
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -25,7 +25,6 @@ STUB_NET_IO_COUNTERS = {'eth0': namedtuple('snetio',
0, 0, 0)}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class NetworkInfoBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.network_info

2
tests/unit/beacons/test_network_settings.py
View file

@ -5,7 +5,6 @@ from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.mixins import LoaderModuleMockMixin
try:
from pyroute2 import IPDB
@ -20,7 +19,6 @@ import logging
log = logging.getLogger(__name__)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class NetworkSettingsBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.network_settings

5
tests/unit/beacons/test_ps.py
View file

@ -4,8 +4,8 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch
from tests.support.unit import TestCase
from tests.support.mock import patch
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -24,7 +24,6 @@ class FakeProcess(object):
return self._name
@skipIf(NO_MOCK, NO_MOCK_REASON)
class PSBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.[s]

5
tests/unit/beacons/test_salt_proxy.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import
from collections import namedtuple
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -17,7 +17,6 @@ PATCH_OPTS = dict(autospec=True, spec_set=True)
FakeProcess = namedtuple('Process', 'cmdline pid')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class SaltProxyBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.[s]

5
tests/unit/beacons/test_sensehat.py
View file

@ -4,15 +4,14 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
import salt.beacons.sensehat as sensehat
@skipIf(NO_MOCK, NO_MOCK_REASON)
class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.[s]

5
tests/unit/beacons/test_service.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import
from collections import namedtuple
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -17,7 +17,6 @@ PATCH_OPTS = dict(autospec=True, spec_set=True)
FakeProcess = namedtuple('Process', 'cmdline pid')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ServiceBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.service

5
tests/unit/beacons/test_smartos_imgadm.py
View file

@ -4,8 +4,8 @@
from __future__ import absolute_import, print_function, unicode_literals
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -45,7 +45,6 @@ MOCK_IMAGE_TWO = {
}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class SmartOSImgAdmBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.imgadm

5
tests/unit/beacons/test_smartos_vmadm.py
View file

@ -4,8 +4,8 @@
from __future__ import absolute_import
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -52,7 +52,6 @@ MOCK_VM_TWO_STARTED = {
}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class SmartOSImgAdmBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.vmadm

3
tests/unit/beacons/test_telegram_bot_msg.py
View file

@ -10,7 +10,7 @@ from salt.beacons import telegram_bot_msg
# Salt testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mock import MagicMock, patch
# Third-party libs
try:
@ -24,7 +24,6 @@ log = logging.getLogger(__name__)
@skipIf(not HAS_TELEGRAM, 'telegram is not available')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class TelegramBotMsgBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.telegram_bot

3
tests/unit/beacons/test_twilio_txt_msg.py
View file

@ -9,7 +9,7 @@ from salt.beacons import twilio_txt_msg
# Salt testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mock import MagicMock, patch
# Import 3rd Party libs
try:
@ -104,7 +104,6 @@ class MockTwilioRestClient(object):
@skipIf(not HAS_TWILIO, 'twilio.rest is not available')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class TwilioMsgTxtBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.twilio_txt_msg

3
tests/unit/beacons/test_wtmp.py
View file

@ -7,7 +7,7 @@ import logging
# Salt testing libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, mock_open
from tests.support.mock import patch, MagicMock, mock_open
from tests.support.mixins import LoaderModuleMockMixin
# Salt libs
@ -27,7 +27,6 @@ pack = (7, 6216, b'pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0
log = logging.getLogger(__name__)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class WTMPBeaconTestCase(TestCase, LoaderModuleMockMixin):
'''
Test case for salt.beacons.[s]

9
tests/unit/cache/test_cache.py vendored
View file

@ -8,12 +8,8 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing libs
# import integration
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
NO_MOCK,
NO_MOCK_REASON,
patch,
)
from tests.support.unit import TestCase
from tests.support.mock import patch
# Import Salt libs
import salt.payload
@ -41,7 +37,6 @@ class CacheFunctionsTest(TestCase):
self.assertIsInstance(ret, salt.cache.MemCache)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class MemCacheTest(TestCase):
'''
Validate Cache class methods

5
tests/unit/cache/test_localfs.py vendored
View file

@ -12,11 +12,9 @@ import tempfile
# Import Salt Testing libs
from tests.support.runtests import RUNTIME_VARS
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -27,7 +25,6 @@ import salt.cache.localfs as localfs
from salt.exceptions import SaltCacheError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class LocalFSTest(TestCase, LoaderModuleMockMixin):
'''
Validate the functions in the localfs cache

5
tests/unit/cli/test_batch.py
View file

@ -10,11 +10,10 @@ from __future__ import absolute_import, print_function, unicode_literals
from salt.cli.batch import Batch
# Import Salt Testing Libs
from tests.support.unit import skipIf, TestCase
from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BatchTestCase(TestCase):
'''
Unit Tests for the salt.cli.batch module

5
tests/unit/cli/test_daemons.py
View file

@ -9,8 +9,8 @@ import logging
import multiprocessing
# Import Salt Testing libs
from tests.support.unit import TestCase, skipIf
from tests.support.mock import patch, MagicMock, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mock import patch, MagicMock
from tests.support.mixins import SaltClientTestCaseMixin
# Import Salt libs
@ -223,7 +223,6 @@ def _syndic_exec_test(child_pipe):
child_pipe.close()
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DaemonsStarterTestCase(TestCase, SaltClientTestCaseMixin):
'''
Unit test for the daemons starter classes.

4
tests/unit/client/test_ssh.py
View file

@ -13,7 +13,7 @@ import tempfile
from tests.support.runtests import RUNTIME_VARS
from tests.support.unit import skipIf, TestCase
from tests.support.case import ShellCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.mock import patch, MagicMock
# Import Salt libs
import salt.config
@ -35,7 +35,6 @@ self:
'''
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not salt.utils.path.which('ssh'), "No ssh binary found in path")
class SSHPasswordTests(ShellCase):
def test_password_failure(self):
@ -105,7 +104,6 @@ class SSHRosterDefaults(TestCase):
shutil.rmtree(tempdir)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class SSHSingleTests(TestCase):
def setUp(self):
self.tmp_cachedir = tempfile.mkdtemp(dir=RUNTIME_VARS.TMP)

3
tests/unit/cloud/clouds/test_dimensiondata.py
View file

@ -23,7 +23,7 @@ from salt.utils.versions import LooseVersion
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch, __version__ as mock_version
from tests.support.mock import MagicMock, patch, __version__ as mock_version
from tests.unit.cloud.clouds import _preferred_ip
VM_NAME = 'winterfell'
@ -57,7 +57,6 @@ class ExtendedTestCase(TestCase):
self.assertEqual(exc.message, exc_msg)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DimensionDataTestCase(ExtendedTestCase, LoaderModuleMockMixin):
'''
Unit TestCase for salt.cloud.clouds.dimensiondata module.

3
tests/unit/cloud/clouds/test_ec2.py
View file

@ -14,7 +14,7 @@ import salt.utils.files
from tests.support.runtests import RUNTIME_VARS
from tests.support.unit import TestCase, skipIf
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, PropertyMock
from tests.support.mock import patch, PropertyMock
from tests.unit.test_crypt import PRIVKEY_DATA
PASS_DATA = (
@ -26,7 +26,6 @@ PASS_DATA = (
)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class EC2TestCase(TestCase, LoaderModuleMockMixin):
'''
Unit TestCase for salt.cloud.clouds.ec2 module.

5
tests/unit/cloud/clouds/test_gce.py
View file

@ -22,8 +22,8 @@ from salt.utils.versions import LooseVersion
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, __version__ as mock_version
from tests.support.unit import TestCase
from tests.support.mock import patch, __version__ as mock_version
VM_NAME = 'kings_landing'
DUMMY_TOKEN = {
@ -48,7 +48,6 @@ except ImportError:
pass
@skipIf(NO_MOCK, NO_MOCK_REASON)
class GCETestCase(TestCase, LoaderModuleMockMixin):
'''
Unit TestCase for salt.cloud.clouds.gce module.

3
tests/unit/cloud/clouds/test_joyent.py
View file

@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -34,7 +32,6 @@ def fake_wait_for_ip(check_for_ip_fn,
return check_for_ip_fn()
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(joyent.HAS_REQUIRED_CRYPTO is False, reason='PyCrypto or Cryptodome not installed')
class JoyentTestCase(TestCase, LoaderModuleMockMixin):
'''

4
tests/unit/cloud/clouds/test_linode.py
View file

@ -8,14 +8,12 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
# Import Salt Libs
from salt.cloud.clouds import linode
@skipIf(NO_MOCK, NO_MOCK_REASON)
class LinodeTestCase(TestCase, LoaderModuleMockMixin):
'''
Unit TestCase for the salt.cloud.clouds.linode module.

3
tests/unit/cloud/clouds/test_opennebula.py
View file

@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch
from tests.support.mock import MagicMock, patch
# Import Salt Libs
from salt.cloud.clouds import opennebula
@ -25,7 +25,6 @@ except ImportError:
VM_NAME = 'my-vm'
@skipIf(NO_MOCK, NO_MOCK_REASON)
class OpenNebulaTestCase(TestCase, LoaderModuleMockMixin):
'''
Unit TestCase for salt.cloud.clouds.opennebula module.

5
tests/unit/cloud/clouds/test_openstack.py
View file

@ -14,8 +14,8 @@ from salt.cloud.clouds import openstack
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch
from tests.support.unit import TestCase
from tests.support.mock import patch
class MockImage(object):
@ -53,7 +53,6 @@ class MockConn(object):
return [self.node]
@skipIf(NO_MOCK, NO_MOCK_REASON)
class OpenstackTestCase(TestCase, LoaderModuleMockMixin):
'''
Unit TestCase for salt.cloud.clouds.openstack module.

5
tests/unit/cloud/clouds/test_saltify.py
View file

@ -8,8 +8,8 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch, ANY
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch, ANY
# Import Salt Libs
@ -32,7 +32,6 @@ TEST_PROFILES = {
TEST_PROFILE_NAMES = ['testprofile1', 'testprofile2', 'testprofile3']
@skipIf(NO_MOCK, NO_MOCK_REASON)
class SaltifyTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.cloud.clouds.saltify

3
tests/unit/cloud/clouds/test_vmware.py
View file

@ -13,7 +13,7 @@ from copy import deepcopy
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch
from tests.support.mock import MagicMock, patch
# Import Salt Libs
from salt import config
@ -74,7 +74,6 @@ class ExtendedTestCase(TestCase, LoaderModuleMockMixin):
self.assertEqual(exc.message, exc_msg)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not HAS_LIBS, 'Install pyVmomi to be able to run this test.')
class VMwareTestCase(ExtendedTestCase):
'''

6
tests/unit/daemons/test_masterapi.py
View file

@ -14,12 +14,10 @@ import salt.utils.platform
# Import Salt Testing Libs
from tests.support.runtests import RUNTIME_VARS
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
patch,
MagicMock,
NO_MOCK,
NO_MOCK_REASON
)
@ -59,7 +57,6 @@ def patch_check_permissions(uid=1, groups=None, is_windows=False, permissive_pki
return decorator
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AutoKeyTest(TestCase):
'''
Tests for the salt.daemons.masterapi.AutoKey class
@ -241,7 +238,6 @@ class AutoKeyTest(TestCase):
self._test_check_autosign_grains(test_func, file_content=file_content, permissions_ret=False)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class LocalFuncsTestCase(TestCase):
'''
TestCase for salt.daemons.masterapi.LocalFuncs class

5
tests/unit/engines/test_libvirt_events.py
View file

@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.unit import TestCase
from tests.support.mock import (
NO_MOCK,
NO_MOCK_REASON,
MagicMock,
patch)
@ -21,7 +19,6 @@ import salt.engines.libvirt_events as libvirt_events
# pylint: disable=protected-access,attribute-defined-outside-init,invalid-name,unused-argument,no-self-use
@skipIf(NO_MOCK, NO_MOCK_REASON)
class EngineLibvirtEventTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.engine.libvirt_events

3
tests/unit/engines/test_slack.py
View file

@ -9,8 +9,6 @@ from __future__ import absolute_import, print_function, unicode_literals
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
NO_MOCK,
NO_MOCK_REASON,
MagicMock,
patch)
@ -20,7 +18,6 @@ import salt.config
@skipIf(slack.HAS_SLACKCLIENT is False, 'The SlackClient is not installed')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class EngineSlackTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.engine.sqs_events

3
tests/unit/engines/test_sqs_events.py
View file

@ -9,8 +9,6 @@ from __future__ import absolute_import, print_function, unicode_literals
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
NO_MOCK,
NO_MOCK_REASON,
MagicMock,
patch)
@ -19,7 +17,6 @@ import salt.engines.sqs_events as sqs_events
@skipIf(sqs_events.HAS_BOTO is False, 'The boto library is not installed')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class EngineSqsEventTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.engine.sqs_events

4
tests/unit/fileserver/test_gitfs.py
View file

@ -22,7 +22,7 @@ except ImportError:
from tests.support.runtests import RUNTIME_VARS
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch
from tests.support.mock import patch
from tests.support.helpers import patched_environ
# Import salt libs
@ -475,7 +475,6 @@ class GitFSTestBase(object):
@skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class GitPythonTest(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):
@ -522,7 +521,6 @@ class GitPythonTest(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMix
@skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required for temp repo setup'.format(GITPYTHON_MINVER))
@skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER))
@skipIf(salt.utils.platform.is_windows(), 'Skip Pygit2 on windows, due to pygit2 access error on windows')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class Pygit2Test(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

5
tests/unit/fileserver/test_roots.py
View file

@ -11,8 +11,8 @@ import tempfile
# Import Salt Testing libs
from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mock import patch
from tests.support.runtests import RUNTIME_VARS
# Import Salt libs
@ -31,7 +31,6 @@ UNICODE_FILENAME = 'питон.txt'
UNICODE_DIRNAME = UNICODE_ENVNAME = 'соль'
@skipIf(NO_MOCK, NO_MOCK_REASON)
class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin):
def setup_loader_modules(self):

3
tests/unit/grains/test_core.py
View file

@ -24,8 +24,6 @@ from tests.support.mock import (
MagicMock,
patch,
mock_open,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -58,7 +56,6 @@ OS_RELEASE_DIR = os.path.join(os.path.dirname(__file__), "os-releases")
SOLARIS_DIR = os.path.join(os.path.dirname(__file__), 'solaris')
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not pytest, False)
class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
'''

5
tests/unit/grains/test_disks.py
View file

@ -8,19 +8,16 @@ import textwrap
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
patch,
MagicMock,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.grains.disks as disks
@skipIf(NO_MOCK, NO_MOCK_REASON)
class IscsiGrainsTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for _windows_disks grains

5
tests/unit/grains/test_fibre_channel.py
View file

@ -6,20 +6,17 @@
from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
patch,
mock_open,
MagicMock,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.grains.fibre_channel as fibre_channel
@skipIf(NO_MOCK, NO_MOCK_REASON)
class FibreChannelGrainsTestCase(TestCase):
'''
Test cases for iscsi grains

5
tests/unit/grains/test_iscsi.py
View file

@ -8,20 +8,17 @@ import errno
import textwrap
# Import Salt Testing Libs
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
patch,
mock_open,
MagicMock,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.grains.iscsi as iscsi
@skipIf(NO_MOCK, NO_MOCK_REASON)
class IscsiGrainsTestCase(TestCase):
'''
Test cases for iscsi grains

5
tests/unit/grains/test_napalm.py
View file

@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -35,7 +33,6 @@ TEST_CACHE = {
}
@skipIf(NO_MOCK, NO_MOCK_REASON)
@patch('salt.grains.napalm.DEVICE_CACHE', TEST_DEVICE_CACHE)
@patch('salt.grains.napalm.GRAINS_CACHE', TEST_CACHE)
class NapalmGrainsTestCase(TestCase, LoaderModuleMockMixin):

7
tests/unit/grains/test_nvme.py
View file

@ -8,20 +8,17 @@ import errno
import textwrap
# Import Salt Testing Libs
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
patch,
mock_open,
MagicMock,
NO_MOCK,
NO_MOCK_REASON
MagicMock
)
# Import Salt Libs
import salt.grains.nvme as nvme
@skipIf(NO_MOCK, NO_MOCK_REASON)
class NvmeGrainsTestCase(TestCase):
'''
Test cases for nvme grains

3
tests/unit/modules/inspectlib/test_collector.py
View file

@ -26,15 +26,12 @@ from tests.support.helpers import no_symlinks
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import salt libs
from salt.modules.inspectlib.collector import Inspector
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(no_symlinks(), "Git missing 'core.symlinks=true' config")
class InspectorCollectorTestCase(TestCase):
'''

5
tests/unit/modules/test_aliases.py
View file

@ -12,11 +12,10 @@ from salt.exceptions import SaltInvocationError
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AliasesTestCase(TestCase, LoaderModuleMockMixin):
'''
TestCase for salt.modules.aliases module

7
tests/unit/modules/test_alternatives.py
View file

@ -11,16 +11,15 @@
from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.unit import TestCase
from tests.support.helpers import TstSuiteLoggingHandler
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.mock import MagicMock, patch
# Import salt libs
import salt.modules.alternatives as alternatives
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AlternativesTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

3
tests/unit/modules/test_ansiblegate.py
View file

@ -29,8 +29,6 @@ from tests.support.unit import TestCase, skipIf
from tests.support.mock import (
patch,
MagicMock,
NO_MOCK,
NO_MOCK_REASON
)
import salt.modules.ansiblegate as ansible
@ -38,7 +36,6 @@ import salt.utils.platform
from salt.exceptions import LoaderError
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(NO_PYTEST, False)
@skipIf(salt.utils.platform.is_windows(), 'Not supported on Windows')
class AnsiblegateTestCase(TestCase, LoaderModuleMockMixin):

5
tests/unit/modules/test_apache.py
View file

@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
mock_open,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -23,7 +21,6 @@ from salt.ext.six.moves.urllib.error import URLError # pylint: disable=import-e
from salt.utils.odict import OrderedDict
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ApacheTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.apache

3
tests/unit/modules/test_aptpkg.py
View file

@ -14,7 +14,7 @@ import textwrap
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import Mock, MagicMock, patch, NO_MOCK, NO_MOCK_REASON
from tests.support.mock import Mock, MagicMock, patch
# Import Salt Libs
from salt.ext import six
@ -158,7 +158,6 @@ UNINSTALL = {
}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AptPkgTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.aptpkg

3
tests/unit/modules/test_archive.py
View file

@ -14,7 +14,7 @@ import os.path
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mock import MagicMock, patch
# Import salt libs
import salt.modules.archive as archive
@ -37,7 +37,6 @@ class ZipFileMock(MagicMock):
return self._files
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

5
tests/unit/modules/test_artifactory.py
View file

@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
# Import Salt libs
import salt.modules.artifactory as artifactory
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ArtifactoryTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

5
tests/unit/modules/test_at.py
View file

@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -21,7 +19,6 @@ import salt.utils.path
import salt.modules.at as at
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AtTestCase(TestCase, LoaderModuleMockMixin):
'''
TestCase for the salt.modules.at module

7
tests/unit/modules/test_azurearm_dns.py
View file

@ -13,11 +13,7 @@ import salt.modules.azurearm_dns as azurearm_dns
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON
)
from tests.support.mock import MagicMock
# Azure libs
# pylint: disable=import-error
@ -111,7 +107,6 @@ class AzureClientMock(object):
return MagicMock(return_value=self.__return_value)()
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_LIBS is False, 'The azure.mgmt.dns module must be installed.')
class AzureRmDnsTestCase(TestCase, LoaderModuleMockMixin):
'''

5
tests/unit/modules/test_beacons.py
View file

@ -10,12 +10,10 @@ import os
# Import Salt Testing Libs
from tests.support.runtests import RUNTIME_VARS
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -23,7 +21,6 @@ import salt.modules.beacons as beacons
from salt.utils.event import SaltEvent
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BeaconsTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.beacons

5
tests/unit/modules/test_bluez_bluetooth.py
View file

@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -37,7 +35,6 @@ class MockBluetooth(object):
return [['a', 'b', 'c'], ['d', 'e', 'f']]
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BluezTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.bluez

3
tests/unit/modules/test_boto_apigateway.py
View file

@ -10,7 +10,7 @@ import string
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mock import MagicMock, patch
# Import Salt libs
import salt.loader
@ -232,7 +232,6 @@ class BotoApiGatewayTestCaseMixin(object):
@skipIf(_has_required_botocore() is False,
'The botocore module must be greater than'
' or equal to version {0}'.format(required_botocore_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoApiGatewayTestCase(BotoApiGatewayTestCaseBase, BotoApiGatewayTestCaseMixin):
'''
TestCase for salt.modules.boto_apigateway module

3
tests/unit/modules/test_boto_cloudtrail.py
View file

@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -97,7 +95,6 @@ if _has_required_boto():
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoCloudTrailTestCaseBase(TestCase, LoaderModuleMockMixin):
conn = None

3
tests/unit/modules/test_boto_cloudwatch_event.py
View file

@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -125,7 +123,6 @@ class BotoCloudWatchEventTestCaseMixin(object):
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoCloudWatchEventTestCase(BotoCloudWatchEventTestCaseBase, BotoCloudWatchEventTestCaseMixin):
'''
TestCase for salt.modules.boto_cloudwatch_event module

3
tests/unit/modules/test_boto_cognitoidentity.py
View file

@ -9,7 +9,7 @@ import string
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mock import MagicMock, patch
# Import Salt libs
import salt.config
@ -154,7 +154,6 @@ class BotoCognitoIdentityTestCaseMixin(object):
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoCognitoIdentityTestCase(BotoCognitoIdentityTestCaseBase, BotoCognitoIdentityTestCaseMixin):
'''
TestCase for salt.modules.boto_cognitoidentity module

3
tests/unit/modules/test_boto_elasticsearch_domain.py
View file

@ -11,8 +11,6 @@ import string
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
NO_MOCK,
NO_MOCK_REASON,
MagicMock,
patch
)
@ -126,7 +124,6 @@ class BotoElasticsearchDomainTestCaseMixin(object):
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoElasticsearchDomainTestCase(BotoElasticsearchDomainTestCaseBase, BotoElasticsearchDomainTestCaseMixin):
'''
TestCase for salt.modules.boto_elasticsearch_domain module

2
tests/unit/modules/test_boto_elb.py
View file

@ -60,7 +60,6 @@ import salt.utils.versions
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
log = logging.getLogger(__name__)
@ -93,7 +92,6 @@ def _has_required_moto():
return True
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_moto() is False, 'The moto module must be >= to {0} for '

4
tests/unit/modules/test_boto_iot.py
View file

@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -122,7 +120,6 @@ if _has_required_boto():
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoIoTTestCaseBase(TestCase, LoaderModuleMockMixin):
conn = None
@ -635,7 +632,6 @@ class BotoIoTPolicyTestCase(BotoIoTTestCaseBase, BotoIoTTestCaseMixin):
' module must be greater than or equal to'
' version {1}.'
.format(required_boto3_version, required_botocore_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoIoTTopicRuleTestCase(BotoIoTTestCaseBase, BotoIoTTestCaseMixin):
'''
TestCase for salt.modules.boto_iot module

5
tests/unit/modules/test_boto_lambda.py
View file

@ -19,8 +19,6 @@ from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -117,7 +115,6 @@ def _has_required_boto():
('The boto3 module must be greater than or equal to version {0}, '
'and botocore must be greater than or equal to {1}'.format(
required_boto3_version, required_botocore_version)))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoLambdaTestCaseBase(TestCase, LoaderModuleMockMixin):
conn = None
@ -468,7 +465,6 @@ class BotoLambdaFunctionTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoLambdaAliasTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin):
'''
TestCase for salt.modules.boto_lambda module aliases
@ -619,7 +615,6 @@ class BotoLambdaAliasTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin):
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoLambdaEventSourceMappingTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin):
'''
TestCase for salt.modules.boto_lambda module mappings

2
tests/unit/modules/test_boto_route53.py
View file

@ -18,7 +18,6 @@ import salt.utils.versions
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.runtests import RUNTIME_VARS
# import Python Third Party Libs
@ -66,7 +65,6 @@ def _has_required_moto():
return True
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_moto() is False, 'The moto module must be >= to {0} for '
'PY2 or {1} for PY3.'.format(required_moto, required_moto_py3))

3
tests/unit/modules/test_boto_s3_bucket.py
View file

@ -12,8 +12,6 @@ from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -200,7 +198,6 @@ if _has_required_boto():
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
' or equal to version {0}'
.format(required_boto3_version))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BotoS3BucketTestCaseBase(TestCase, LoaderModuleMockMixin):
conn = None

2
tests/unit/modules/test_boto_secgroup.py
View file

@ -11,7 +11,6 @@ import sys
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.runtests import RUNTIME_VARS
# Import Salt libs
@ -83,7 +82,6 @@ def _has_required_boto():
return True
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'

11
tests/unit/modules/test_boto_vpc.py
View file

@ -17,7 +17,7 @@ from pkg_resources import DistributionNotFound
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.mock import MagicMock, patch
from tests.support.runtests import RUNTIME_VARS
# Import Salt libs
@ -128,7 +128,6 @@ def _has_required_moto():
return True
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -586,7 +585,6 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
boto_vpc.describe(vpc_id=None, **conn_parameters)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -890,7 +888,6 @@ class BotoVpcSubnetsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertEqual(describe_subnet_results['subnets'][0]['availability_zone'], 'us-east-1a')
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -952,7 +949,6 @@ class BotoVpcInternetGatewayTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue(igw_creation_result.get('created'))
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -1002,7 +998,6 @@ class BotoVpcNatGatewayTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertTrue(ngw_creation_result.get('created'))
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -1040,7 +1035,6 @@ class BotoVpcCustomerGatewayTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertFalse(gw_exists_result['exists'])
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -1209,7 +1203,6 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
boto_vpc.dhcp_options_exists(**conn_parameters)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -1572,7 +1565,6 @@ class BotoVpcNetworkACLTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertFalse(dhcp_disassociate_result)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'
@ -1792,7 +1784,6 @@ class BotoVpcRouteTablesTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin):
self.assertFalse(route_replacing_result)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
@skipIf(HAS_MOTO is False, 'The moto module must be installed.')
@skipIf(_has_required_boto() is False, 'The boto module must be greater than'

5
tests/unit/modules/test_bower.py
View file

@ -8,15 +8,14 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
# Import Salt Libs
import salt.modules.bower as bower
from salt.exceptions import CommandExecutionError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BowerTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.bower

5
tests/unit/modules/test_bridge.py
View file

@ -8,14 +8,13 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
# Import Salt Libs
import salt.modules.bridge as bridge
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BridgeTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.bridge

5
tests/unit/modules/test_btrfs.py
View file

@ -7,13 +7,11 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
mock_open,
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -23,7 +21,6 @@ import salt.modules.btrfs as btrfs
from salt.exceptions import CommandExecutionError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class BtrfsTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.btrfs

5
tests/unit/modules/test_cassandra.py
View file

@ -7,12 +7,10 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -20,7 +18,6 @@ from salt.ext import six
import salt.modules.cassandra as cassandra
@skipIf(NO_MOCK, NO_MOCK_REASON)
class CassandraTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.cassandra

5
tests/unit/modules/test_chef.py
View file

@ -7,19 +7,16 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.modules.chef as chef
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ChefTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.chef

8
tests/unit/modules/test_chroot.py
View file

@ -33,12 +33,7 @@ import sys
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch,
)
from tests.support.mock import MagicMock, patch
from salt.exceptions import CommandExecutionError
import salt.utils.platform
@ -46,7 +41,6 @@ import salt.modules.chroot as chroot
@skipIf(salt.utils.platform.is_windows(), 'This test cannot work on Windows')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ChrootTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.chroot

3
tests/unit/modules/test_cmdmod.py
View file

@ -25,8 +25,6 @@ from tests.support.mock import (
mock_open,
Mock,
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
@ -69,7 +67,6 @@ class MockTimedProc(object):
return self._stderr
@skipIf(NO_MOCK, NO_MOCK_REASON)
class CMDMODTestCase(TestCase, LoaderModuleMockMixin):
'''
Unit tests for the salt.modules.cmdmod module

5
tests/unit/modules/test_composer.py
View file

@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -21,7 +19,6 @@ import salt.modules.composer as composer
from salt.exceptions import CommandExecutionError, CommandNotFoundError, SaltInvocationError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class ComposerTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.composer

5
tests/unit/modules/test_config.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch
from tests.support.unit import TestCase
from tests.support.mock import patch
# Import Salt libs
import salt.modules.config as config
@ -17,7 +17,6 @@ DEFAULTS = {
}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class TestModulesConfig(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

5
tests/unit/modules/test_cp.py
View file

@ -8,14 +8,12 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.unit import TestCase
from tests.support.mock import (
Mock,
MagicMock,
mock_open,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -27,7 +25,6 @@ import salt.modules.cp as cp
from salt.exceptions import CommandExecutionError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class CpTestCase(TestCase, LoaderModuleMockMixin):
'''
TestCase for salt.modules.cp module

5
tests/unit/modules/test_cpan.py
View file

@ -7,18 +7,15 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.modules.cpan as cpan
@skipIf(NO_MOCK, NO_MOCK_REASON)
class CpanTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.cpan

6
tests/unit/modules/test_cron.py
View file

@ -8,8 +8,8 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch, call
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch, call
# Import Salt libs
import salt.modules.cron as cron
@ -60,7 +60,6 @@ def write_crontab(*args, **kw):
return MagicMock()
@skipIf(NO_MOCK, NO_MOCK_REASON)
class CronTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):
@ -878,7 +877,6 @@ class CronTestCase(TestCase, LoaderModuleMockMixin):
python_shell=False)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class PsTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

3
tests/unit/modules/test_cyg.py
View file

@ -5,7 +5,7 @@
# # Import Salt Testing libs
# from tests.support.unit import skipIf, TestCase
# from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# from tests.support.mock import MagicMock, patch
# # Import salt libs
# import salt.modules.cyg as cyg
@ -13,7 +13,6 @@
# cyg.__salt__ = {}
# @skipIf(NO_MOCK, NO_MOCK_REASON)
# class TestcygModule(TestCase):
# def test__get_cyg_dir(self):

5
tests/unit/modules/test_daemontools.py
View file

@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
import os
@ -22,7 +20,6 @@ import salt.modules.daemontools as daemontools
from salt.exceptions import CommandExecutionError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DaemontoolsTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.daemontools

5
tests/unit/modules/test_data.py
View file

@ -7,20 +7,17 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
mock_open,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.modules.data as data
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DataTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.data

3
tests/unit/modules/test_ddns.py
View file

@ -20,8 +20,6 @@ from tests.support.mock import (
mock_open,
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -30,7 +28,6 @@ import salt.modules.ddns as ddns
@skipIf(HAS_DNS is False, 'dnspython libs not installed')
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DDNSTestCase(TestCase, LoaderModuleMockMixin):
'''
TestCase for the salt.modules.ddns module

5
tests/unit/modules/test_deb_apache.py
View file

@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -21,7 +19,6 @@ import salt.modules.deb_apache as deb_apache
from salt.ext import six
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DebApacheTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.deb_apache

7
tests/unit/modules/test_deb_postgres.py
View file

@ -5,8 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch
from tests.support.unit import TestCase
from tests.support.mock import Mock, patch
# Import salt libs
from salt.ext import six
@ -20,7 +20,6 @@ LSCLUSTER = '''\
'''
@skipIf(NO_MOCK, NO_MOCK_REASON)
class PostgresClusterTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):
@ -65,7 +64,6 @@ class PostgresClusterTestCase(TestCase, LoaderModuleMockMixin):
# datadir='/opt/postgresql'))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class PostgresLsClusterTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):
@ -121,7 +119,6 @@ class PostgresLsClusterTestCase(TestCase, LoaderModuleMockMixin):
self.assertFalse(deb_postgres.cluster_exists('3.4', 'main'))
@skipIf(NO_MOCK, NO_MOCK_REASON)
class PostgresDeleteClusterTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

5
tests/unit/modules/test_debconfmod.py
View file

@ -7,12 +7,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -20,7 +18,6 @@ import salt.modules.debconfmod as debconfmod
import os
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DebconfmodTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.DebconfmodTestCase

3
tests/unit/modules/test_debian_ip.py
View file

@ -13,8 +13,6 @@ from tests.support.unit import TestCase, skipIf
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
@ -25,7 +23,6 @@ import salt.utils.platform
import jinja2.exceptions
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(salt.utils.platform.is_windows(), 'Do not run these tests on Windows')
class DebianIpTestCase(TestCase, LoaderModuleMockMixin):
'''

5
tests/unit/modules/test_debian_service.py
View file

@ -7,19 +7,16 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.modules.debian_service as debian_service
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DebianServicesTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.debian_service

5
tests/unit/modules/test_defaults.py
View file

@ -8,19 +8,16 @@ import inspect
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.modules.defaults as defaults
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DefaultsTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.defaults

Some files were not shown because too many files have changed in this diff Show more