From 97feaa7823878a4f87e7caa18301eb710528e2cc Mon Sep 17 00:00:00 2001
From: Ross McFarland <ross@github.com>
Date: Mon, 25 Jan 2021 15:32:30 -0800
Subject: [PATCH 1/2] Rename extention zonefile test to avoid existing
 unit.tests.

---
 tests/test_octodns_source_axfr.py                         | 6 +++---
 .../{unit.tests.extension => ext.unit.tests.extension}    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/zones/{unit.tests.extension => ext.unit.tests.extension} (61%)

diff --git a/tests/test_octodns_source_axfr.py b/tests/test_octodns_source_axfr.py
index f808166..a1d2e1c 100644
--- a/tests/test_octodns_source_axfr.py
+++ b/tests/test_octodns_source_axfr.py
@@ -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):
diff --git a/tests/zones/unit.tests.extension b/tests/zones/ext.unit.tests.extension
similarity index 61%
rename from tests/zones/unit.tests.extension
rename to tests/zones/ext.unit.tests.extension
index 2821d9a..2ed7ac6 100644
--- a/tests/zones/unit.tests.extension
+++ b/tests/zones/ext.unit.tests.extension
@@ -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.

From c08d4ac88f9e8d0e02435e9ec27a57706ca62cc5 Mon Sep 17 00:00:00 2001
From: Ross McFarland <ross@github.com>
Date: Mon, 25 Jan 2021 15:35:37 -0800
Subject: [PATCH 2/2] Look for zone filename not zone_name in axfr directory
 listing

---
 octodns/source/axfr.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/octodns/source/axfr.py b/octodns/source/axfr.py
index 1ca2c67..ed3f98f 100644
--- a/octodns/source/axfr.py
+++ b/octodns/source/axfr.py
@@ -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: