Merge pull request #34642 from jtand/mysql_integration_cleanup

Check that mysqladmin exists before running mysql integration tests
This commit is contained in:
Mike Place 2016-07-13 12:12:44 -06:00 committed by GitHub
commit 8a0209101e

View file

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