Skip to content

Commit

Permalink
remove _config pytest fixutres
Browse files Browse the repository at this point in the history
  • Loading branch information
Ch3LL committed Mar 8, 2021
1 parent 292f6d0 commit 26bc931
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
14 changes: 0 additions & 14 deletions tests/pytests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,20 +359,6 @@ def bridge_pytest_and_runtests():
"""


@pytest.fixture
def minion_config():
opts = salt.config.DEFAULT_MINION_OPTS.copy()
opts["__role"] = "minion"
return opts


@pytest.fixture
def master_config():
opts = salt.config.DEFAULT_MASTER_OPTS.copy()
opts["__role"] = "master"
return opts


# ----- Async Test Fixtures ----------------------------------------------------------------------------------------->
# This is based on https://github.com/eukaryote/pytest-tornasync
# The reason why we don't use that pytest plugin instead is because it has
Expand Down
1 change: 0 additions & 1 deletion tests/pytests/unit/client/test_ssh.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pytest
import salt.client.ssh.client
import salt.config
import salt.utils.msgpack
from salt.client import ssh
from tests.support.mock import MagicMock, patch
Expand Down

0 comments on commit 26bc931

Please sign in to comment.