valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20556 from cachedout/fix_loader_pylint

Browse Source 
Fix loader pylint
This commit is contained in:
Mike Place 2015-02-10 08:47:46 -07:00
commit 0341fdcdbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/loader/loader.py
View File

@ -20,7 +20,7 @@ from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
import integration
import tests.integration
# Import Salt libs
# pylint: disable=import-error,no-name-in-module,redefined-builtin
@ -179,7 +179,7 @@ class LazyLoaderReloadingTest(TestCase):
def setUp(self):
self.opts = _config = minion_config(None)
self.tmp_dir = tempfile.mkdtemp(dir=integration.TMP)
self.tmp_dir = tempfile.mkdtemp(dir=tests.integration.TMP)
self.count = 0
@ -303,7 +303,7 @@ class LazyLoaderSubmodReloadingTest(TestCase):
def setUp(self):
self.opts = _config = minion_config(None)
self.tmp_dir = tempfile.mkdtemp(dir=integration.TMP)
self.tmp_dir = tempfile.mkdtemp(dir=tests.integration.TMP)
os.makedirs(self.module_dir)
self.count = 0
@ -446,7 +446,7 @@ class LazyLoaderDeepSubmodReloadingTest(TestCase):
def setUp(self):
self.opts = _config = minion_config(None)
self.tmp_dir = tempfile.mkdtemp(dir=integration.TMP)
self.tmp_dir = tempfile.mkdtemp(dir=tests.integration.TMP)
os.makedirs(self.module_dir)
self.lib_count = collections.defaultdict(int) # mapping of path -> count