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

Import 'integrations' not 'tests.integrations'

Browse Source
This commit is contained in:
Pedro Algarvio 2015-10-23 18:55:54 +01:00
parent 33336a799b
commit 7b262f8bf7
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 tests.integration
import integration
# Import Salt libs
# pylint: disable=import-error,no-name-in-module,redefined-builtin
@ -189,7 +189,7 @@ class LazyLoaderReloadingTest(TestCase):
def setUp(self):
self.opts = _config = minion_config(None)
self.opts['grains'] = grains(self.opts)
self.tmp_dir = tempfile.mkdtemp(dir=tests.integration.TMP)
self.tmp_dir = tempfile.mkdtemp(dir=integration.TMP)
self.count = 0
@ -314,7 +314,7 @@ class LazyLoaderSubmodReloadingTest(TestCase):
def setUp(self):
self.opts = _config = minion_config(None)
self.opts['grains'] = grains(self.opts)
self.tmp_dir = tempfile.mkdtemp(dir=tests.integration.TMP)
self.tmp_dir = tempfile.mkdtemp(dir=integration.TMP)
os.makedirs(self.module_dir)
self.count = 0
@ -457,7 +457,7 @@ class LazyLoaderDeepSubmodReloadingTest(TestCase):
def setUp(self):
self.opts = _config = minion_config(None)
self.tmp_dir = tempfile.mkdtemp(dir=tests.integration.TMP)
self.tmp_dir = tempfile.mkdtemp(dir=integration.TMP)
os.makedirs(self.module_dir)
self.lib_count = collections.defaultdict(int) # mapping of path -> count