Merge pull request #34818 from jtand/mysql_state_integration_test_cleanup

Skip mysql state test if mysqladmin is not available
This commit is contained in:
Mike Place 2016-07-20 10:10:35 -06:00 committed by GitHub
commit 98fa4a404e

View file

@ -17,6 +17,7 @@ ensure_in_syspath('../../')
# Import salt libs
import integration
import salt.utils
import salt.ext.six as six
from salt.modules import mysql as mysqlmod
@ -28,6 +29,9 @@ try:
except ImportError:
NO_MYSQL = True
if not salt.utils.which('mysqladmin'):
NO_MYSQL = True
@skipIf(
NO_MYSQL,