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

Update test_dnsutil.py

Browse source
This commit is contained in:
Frode Gundersen 2023-04-11 09:27:16 -06:00 • committed by Daniel Wozniak
parent 8cc982aea8
commit 3584cd200d
1 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
tests/pytests/unit/modules/test_dnsutil.py
View file

@ -4,8 +4,6 @@
TestCase for salt.modules.dnsutil
"""
import logging
import pytest
import salt.modules.dnsutil as dnsutil
@ -15,7 +13,7 @@ from tests.support.mock import MagicMock, mock_open, patch
@pytest.fixture
def mock_hosts_file():
return salt.utils.stringutils.to_str(
return (
"##\n"
"# Host Database\n"
"#\n"
@ -41,7 +39,7 @@ def mock_hosts_file_rtn():
@pytest.fixture
def mock_soa_zone():
return salt.utils.stringutils.to_str(
return (
"$TTL 3D\n"
"@ IN SOA land-5.com. root.land-5.com. (\n"
"199609203 ; Serial\n"
@ -56,30 +54,22 @@ def mock_soa_zone():
@pytest.fixture
def mock_writes_list():
return salt.utils.data.decode(
[
"##\n",
"# Host Database\n",
"#\n",
"# localhost is used to configure the loopback interface\n",
"# when the system is booting. Do not change this entry.\n",
"##\n",
"127.0.0.1 localhost",
"\n",
"255.255.255.255 broadcasthost",
"\n",
"::1 localhost",
"\n",
"fe80::1%lo0 localhost",
"\n",
],
to_str=True,
)
@pytest.fixture
def log():
return logging.getLogger(__name__)
return [
"##\n",
"# Host Database\n",
"#\n",
"# localhost is used to configure the loopback interface\n",
"# when the system is booting. Do not change this entry.\n",
"##\n",
"127.0.0.1 localhost",
"\n",
"255.255.255.255 broadcasthost",
"\n",
"::1 localhost",
"\n",
"fe80::1%lo0 localhost",
"\n",
]
@pytest.fixture
@ -123,13 +113,6 @@ def test_hosts_remove(mock_hosts_file, mock_writes_list):
assert writes == mock_writes_list, writes
@pytest.mark.skip(reason="Waiting on bug report fixes")
def test_parse_zone(log, mock_soa_zone):
with patch("salt.utils.files.fopen", mock_open(read_data=mock_soa_zone)):
log.debug(mock_soa_zone)
log.debug(dnsutil.parse_zone("/var/lib/named/example.com.zone"))
def test_to_seconds_hour():
assert dnsutil._to_seconds("4H") == 14400, "Did not detect valid hours as invalid"