saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Be sure to import the required fixtures

Browse source
This commit is contained in:
Pedro Algarvio 2022-03-17 11:09:16 +00:00 • committed by Gareth J. Greenaway
parent 2c2b9f7fd8
commit 676e3c061e
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/filename_map.yml
View file

@ -285,6 +285,10 @@ salt/(minion\.py|channel/.+|transport/.+):
tests/support/mock.py:
- unit.test_mock
tests/support/pytest/mysql.py:
- pytests.integration.states.test_mysql
- pytests.integration.modules.test_mysql
tests/pytests/scenarios/multimaster:
- pytests.scenarios.multimaster.test_multimaster
- pytests.scenarios.multimaster.test_offline_master

2
tests/pytests/integration/modules/test_mysql.py
View file

@ -5,7 +5,7 @@ import logging
import pytest
import salt.modules.mysql as mysql
from tests.support.pytest.mysql import mysql_container # pylint: disable=unused-import
from tests.support.pytest.mysql import * # pylint: disable=wildcard-import,unused-wildcard-import
log = logging.getLogger(__name__)

2
tests/pytests/integration/states/test_mysql.py
View file

@ -5,7 +5,7 @@ import logging
import pytest
import salt.modules.mysql as mysql
from tests.support.pytest.mysql import mysql_container # pylint: disable=unused-import
from tests.support.pytest.mysql import * # pylint: disable=wildcard-import,unused-wildcard-import
log = logging.getLogger(__name__)

2
tests/support/pytest/mysql.py
View file

@ -93,7 +93,7 @@ def mysql_image(request, docker_client):
@pytest.fixture(scope="module")
def mysql_container(salt_factories, salt_call_cli, mysql_image):
def mysql_container(salt_factories, docker_client, salt_call_cli, mysql_image):
mysql_user = "root"
mysql_passwd = "password"