mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Merge pull request #664 from octodns/zonefile-ext-fix

Browse Source 
Rename extention zonefile test to avoid existing unit.tests.
This commit is contained in:
Ross McFarland
2021-01-25 17:36:32 -08:00
committed by GitHub
parent e232d595de c08d4ac88f
commit 3a37620ce5
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
octodns/source/axfr.py
View File

@@ -229,14 +229,16 @@ class ZoneFileSource(AxfrBaseSource):
self._zone_records = {}
def _load_zone_file(self, zone_name):
zone_filename = zone_name
if self.file_extension:
zone_filename = '{}{}'.format(zone_name,
self.file_extension.lstrip('.'))
zonefiles = listdir(self.directory)
if zone_name in zonefiles:
if zone_filename in zonefiles:
try:
filename = zone_name
if self.file_extension:
filename = '{}{}'.format(zone_name,
self.file_extension.lstrip('.'))
z = dns.zone.from_file(join(self.directory, filename),
z = dns.zone.from_file(join(self.directory, zone_filename),
zone_name, relativize=False,
check_origin=self.check_origin)
except DNSException as error:

6
tests/test_octodns_source_axfr.py
View File

@@ -45,12 +45,12 @@ class TestAxfrSource(TestCase):
class TestZoneFileSource(TestCase):
source = ZoneFileSource('test', './tests/zones')
source_extension = ZoneFileSource('test', './tests/zones', 'extension')
def test_zonefiles_with_extension(self):
source = ZoneFileSource('test', './tests/zones', 'extension')
# Load zonefiles with a specified file extension
valid = Zone('unit.tests.', [])
self.source_extension.populate(valid)
valid = Zone('ext.unit.tests.', [])
source.populate(valid)
self.assertEquals(1, len(valid.records))
def test_populate(self):

8
tests/zones/unit.tests.extension → tests/zones/ext.unit.tests.extension
View File

@@ -1,5 +1,5 @@
$ORIGIN unit.tests.
@ 3600 IN SOA ns1.unit.tests. root.unit.tests. (
$ORIGIN ext.unit.tests.
@ 3600 IN SOA ns1.ext.unit.tests. root.ext.unit.tests. (
2018071501 ; Serial
3600 ; Refresh (1 hour)
600 ; Retry (10 minutes)
@@ -8,5 +8,5 @@ $ORIGIN unit.tests.
)
; NS Records
@ 3600 IN NS ns1.unit.tests.
@ 3600 IN NS ns2.unit.tests.
@ 3600 IN NS ns1.ext.unit.tests.
@ 3600 IN NS ns2.ext.unit.tests.