mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix test failures
This commit is contained in:
parent
bd564da5b8
commit
c336cdb1c9
2 changed files with 8 additions and 2 deletions
|
@ -1,5 +1,6 @@
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
import salt.modules.test as testmod
|
||||||
import salt.states.group as group
|
import salt.states.group as group
|
||||||
import salt.utils.platform
|
import salt.utils.platform
|
||||||
from tests.support.mock import MagicMock, call, patch
|
from tests.support.mock import MagicMock, call, patch
|
||||||
|
@ -7,8 +8,13 @@ from tests.support.mock import MagicMock, call, patch
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def configure_loader_modules():
|
def configure_loader_modules():
|
||||||
|
|
||||||
return {
|
return {
|
||||||
group: {"__salt__": {"test.ping": MagicMock()}, "__opts__": {"test": False}}
|
testmod: {},
|
||||||
|
group: {
|
||||||
|
"__salt__": {"test.ping": testmod.ping},
|
||||||
|
"__opts__": {"test": False},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -258,7 +258,7 @@ class BuildoutTestCase(Base):
|
||||||
else:
|
else:
|
||||||
line_break = "\n"
|
line_break = "\n"
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
f"foo{line_break}",
|
f"# pylint: skip-file{line_break}foo{line_break}",
|
||||||
buildout._get_bootstrap_content(os.path.join(self.tdir, "var", "tb", "2")),
|
buildout._get_bootstrap_content(os.path.join(self.tdir, "var", "tb", "2")),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue