Be sure to import the required fixtures

saltstack · Mar 17, 2022 · 676e3c0 · 676e3c0
1 parent 2c2b9f7
commit 676e3c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/tests/filename_map.yml b/tests/filename_map.yml
@@ -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

diff --git a/tests/pytests/integration/modules/test_mysql.py b/tests/pytests/integration/modules/test_mysql.py
@@ -5,7 +5,7 @@
 
 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__)
 

diff --git a/tests/pytests/integration/states/test_mysql.py b/tests/pytests/integration/states/test_mysql.py
@@ -5,7 +5,7 @@
 
 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__)
 

diff --git a/tests/support/pytest/mysql.py b/tests/support/pytest/mysql.py
@@ -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"