Import the pytest fixtures on the "main" conftest.py

tests/conftest.py

@@ -34,6 +34,7 @@ import saltfactories.utils.compat
 from _pytest.mark.evaluate import MarkEvaluator
 from salt.serializers import yaml
 from tests.support.helpers import PRE_PYTEST_SKIP_OR_NOT, PRE_PYTEST_SKIP_REASON
+from tests.support.pytest.fixtures import *  # pylint: disable=unused-wildcard-import
 from tests.support.pytest.helpers import *  # pylint: disable=unused-wildcard-import
 from tests.support.runtests import RUNTIME_VARS
 from tests.support.saltfactories_compat import LogServer

tests/integration/conftest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     tests.integration.conftest
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -7,12 +6,10 @@
 """
 # pylint: disable=unused-argument,redefined-outer-name
 
-from __future__ import absolute_import, unicode_literals
 
 import logging
 
 import pytest
-from tests.support.pytest.fixtures import *  # pylint: disable=unused-wildcard-import
 
 log = logging.getLogger(__name__)
 
@@ -33,12 +30,12 @@ log = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope="package")
-def salt_master(request, salt_factories):
+def salt_master(request, salt_factories, salt_master_config):
     return salt_factories.spawn_master(request, "master")
 
 
 @pytest.fixture(scope="package")
-def salt_minion(request, salt_factories, salt_master):
+def salt_minion(request, salt_factories, salt_master, salt_minion_config):
     proc = salt_factories.spawn_minion(request, "minion", master_id="master")
     # Sync All
     salt_call_cli = salt_factories.get_salt_call_cli("minion")
@@ -48,7 +45,7 @@ def salt_minion(request, salt_factories, salt_master):
 
 
 @pytest.fixture(scope="package")
-def salt_sub_minion(request, salt_factories, salt_master):
+def salt_sub_minion(request, salt_factories, salt_master, salt_sub_minion_config):
     proc = salt_factories.spawn_minion(request, "sub_minion", master_id="master")
     # Sync All
     salt_call_cli = salt_factories.get_salt_call_cli("sub_minion")

tests/multimaster/conftest.py

@@ -13,7 +13,6 @@ import pytest
 import salt.utils.files
 from salt.serializers import yaml
 from salt.utils.immutabletypes import freeze
-from tests.support.pytest.fixtures import *  # pylint: disable=unused-wildcard-import
 from tests.support.runtests import RUNTIME_VARS
 
 log = logging.getLogger(__name__)

tests/pytests/integration/conftest.py

@@ -2,5 +2,50 @@ import pytest
 
 
 @pytest.fixture(scope="package")
-def salt_master(request, salt_factories):
+def salt_master(request, salt_factories, salt_master_config):
     return salt_factories.spawn_master(request, "master")
+
+
+@pytest.fixture(scope="package")
+def salt_minion(request, salt_factories, salt_master, salt_minion_config):
+    proc = salt_factories.spawn_minion(request, "minion", master_id="master")
+    # Sync All
+    salt_call_cli = salt_factories.get_salt_call_cli("minion")
+    ret = salt_call_cli.run("saltutil.sync_all", _timeout=120)
+    assert ret.exitcode == 0, ret
+    return proc
+
+
+@pytest.fixture(scope="package")
+def salt_sub_minion(request, salt_factories, salt_master, salt_sub_minion_config):
+    proc = salt_factories.spawn_minion(request, "sub_minion", master_id="master")
+    # Sync All
+    salt_call_cli = salt_factories.get_salt_call_cli("sub_minion")
+    ret = salt_call_cli.run("saltutil.sync_all", _timeout=120)
+    assert ret.exitcode == 0, ret
+    return proc
+
+
+@pytest.fixture(scope="package")
+def salt_cli(salt_factories, salt_minion, salt_master):
+    return salt_factories.get_salt_cli(salt_master.config["id"])
+
+
+@pytest.fixture(scope="package")
+def salt_cp_cli(salt_factories, salt_minion, salt_master):
+    return salt_factories.get_salt_cp_cli(salt_master.config["id"])
+
+
+@pytest.fixture(scope="package")
+def salt_key_cli(salt_factories, salt_minion, salt_master):
+    return salt_factories.get_salt_key_cli(salt_master.config["id"])
+
+
+@pytest.fixture(scope="package")
+def salt_run_cli(salt_factories, salt_minion, salt_master):
+    return salt_factories.get_salt_run_cli(salt_master.config["id"])
+
+
+@pytest.fixture(scope="package")
+def salt_call_cli(salt_factories, salt_minion, salt_master):
+    return salt_factories.get_salt_call_cli(salt_minion.config["id"])

tests/unit/conftest.py

@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from tests.support.pytest.fixtures import *  # pylint: disable=unused-wildcard-import