mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #34642 from jtand/mysql_integration_cleanup
Check that mysqladmin exists before running mysql integration tests
This commit is contained in:
commit
8a0209101e
1 changed files with 4 additions and 0 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Reference in a new issue