mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Revert some reviewer suggestions as broke existing tests
This commit is contained in:
parent
2958d3747e
commit
d0851b498f
1 changed files with 4 additions and 1 deletions
|
@ -2,7 +2,9 @@ import logging
|
|||
|
||||
import pytest
|
||||
|
||||
import salt.config
|
||||
import salt.daemons.masterapi as masterapi
|
||||
import salt.utils.platform
|
||||
from tests.support.mock import MagicMock, patch
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
@ -22,7 +24,8 @@ def check_keys():
|
|||
|
||||
@pytest.fixture
|
||||
def local_funcs(master_opts):
|
||||
return masterapi.LocalFuncs(master_opts, "test-key")
|
||||
opts = salt.config.master_config(None)
|
||||
return masterapi.LocalFuncs(opts, "test-key")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
|
Loading…
Add table
Reference in a new issue