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

Fix tests

Browse source
This commit is contained in:
Erik Johnson 2020-04-23 15:57:57 -06:00 • committed by Daniel Wozniak
parent 273fc9e65c
commit d321e1ce99
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/unit/test_fileclient.py
View file

@ -18,17 +18,11 @@ from salt.ext import six
from salt.ext.six.moves import range
from tests.integration import AdaptedConfigurationTestCaseMixin
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.mock import ( # pylint: disable=no-name-in-module
NO_MOCK,
NO_MOCK_REASON,
MagicMock,
Mock,
patch,
)
from tests.support.mock import MagicMock, Mock, patch
# Import Salt Testing libs
from tests.support.runtests import RUNTIME_VARS
from tests.support.unit import TestCase, skipIf
from tests.support.unit import TestCase
log = logging.getLogger(__name__)
@ -108,7 +102,6 @@ def _get_file_roots(fs_root):
return dict([(x, [os.path.join(fs_root, x)]) for x in SALTENVS])
@skipIf(NO_MOCK, NO_MOCK_REASON)
class FileClientTest(
TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin
):
@ -155,7 +148,6 @@ class FileClientTest(
self.assertEqual("remote_client", ret)
@skipIf(NO_MOCK, NO_MOCK_REASON)
class FileclientCacheTest(
TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin
):