valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't force import of salt.master in integration tests

Browse Source
This commit is contained in:
Thomas S Hatch 2014-06-27 13:13:41 -06:00
parent a09a3c02c4
commit a56bed4d03
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration/__init__.py
View File

@ -52,7 +52,6 @@ ensure_in_syspath(CODE_DIR, SALT_LIBS)
import salt
import salt._compat
import salt.config
import salt.master
import salt.minion
import salt.runner
import salt.output
@ -61,6 +60,12 @@ import salt.utils
from salt.utils import fopen, get_colors
from salt.utils.verify import verify_env
try:
import salt.master
except ImportError:
# Not required fro raet tests
pass
# Import 3rd-party libs
import yaml