fix this better, don't use clean_proc from master.py.

This commit is contained in:
Thomas S Hatch 2014-07-15 15:06:15 -06:00
parent b9421f7c8d
commit 6abccbc0cf
2 changed files with 3 additions and 7 deletions

View File

@ -18,12 +18,8 @@ import multiprocessing
import sys
# Import third party libs
try:
import zmq
from M2Crypto import RSA
except ImportError:
# Don't fail on RAET when utils may import
pass
import zmq
from M2Crypto import RSA
# Import salt libs
import salt.crypt

View File

@ -23,7 +23,7 @@ ensure_in_syspath('../../')
# Import salt libs
import integration
from salt.master import clean_proc
from salt.utils.process import clean_proc
from salt.utils import event
SOCK_DIR = os.path.join(integration.TMP, 'test-socks')