saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix tests

Browse source
This commit is contained in:
twangboy 2020-06-05 23:50:29 -06:00 • committed by Daniel Wozniak
parent 950ce9ac60
commit 5515405fdb
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/unit/grains/test_core.py
View file

@ -1193,14 +1193,14 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
):
assert core.dns() == ret
def test_enablefqdnsFalse(self):
def test_enable_fqdns_false(self):
"""
tests enable_fqdns_grains is set to False
"""
with patch.dict("salt.grains.core.__opts__", {"enable_fqdns_grains": False}):
assert core.fqdns() == {"fqdns": []}
def test_enablefqdnsTrue(self):
def test_enable_fqdns_true(self):
"""
testing that grains uses network.fqdns module
"""
@ -1211,14 +1211,14 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
with patch.dict("salt.grains.core.__opts__", {"enable_fqdns_grains": True}):
assert core.fqdns() == "my.fake.domain"
def test_enablefqdnsNone(self):
def test_enable_fqdns_none(self):
"""
testing default fqdns grains is returned when enable_fqdns_grains is None
"""
with patch.dict("salt.grains.core.__opts__", {"enable_fqdns_grains": None}):
assert core.fqdns() == {"fqdns": []}
def test_enablefqdnswithoutpaching(self):
def test_enable_fqdns_without_patching(self):
"""
testing fqdns grains is enabled by default
"""
@ -1226,7 +1226,11 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
"salt.grains.core.__salt__",
{"network.fqdns": MagicMock(return_value="my.fake.domain")},
):
assert core.fqdns() == "my.fake.domain"
# fqdns is disabled by default on Windows
if salt.utils.platform.is_windows():
assert core.fqdns() == {"fqdns": []}
else:
assert core.fqdns() == "my.fake.domain"
@skipIf(not salt.utils.platform.is_linux(), "System is not Linux")
@patch(