From ea943e606ed358cc23cd91bd0ba7f2508ab81fcf Mon Sep 17 00:00:00 2001
From: Ross McFarland <ross@github.com>
Date: Mon, 25 Jan 2021 15:45:23 -0800
Subject: [PATCH] Avoid . on the end of files, but still test axfr default

---
 .gitignore                                          |  3 ++-
 tests/test_octodns_source_axfr.py                   | 13 +++++++++++--
 .../zones/{invalid.records. => invalid.records.tst} |  0
 tests/zones/{invalid.zone. => invalid.zone.tst}     |  0
 tests/zones/{unit.tests. => unit.tests.tst}         |  0
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename tests/zones/{invalid.records. => invalid.records.tst} (100%)
 rename tests/zones/{invalid.zone. => invalid.zone.tst} (100%)
 rename tests/zones/{unit.tests. => unit.tests.tst} (100%)

diff --git a/.gitignore b/.gitignore
index 715b687..5192821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@
 *.pyc
 .coverage
 .env
-/config/
 /build/
+/config/
 coverage.xml
 dist/
 env/
@@ -14,4 +14,5 @@ htmlcov/
 nosetests.xml
 octodns.egg-info/
 output/
+tests/zones/unit.tests.
 tmp/
diff --git a/tests/test_octodns_source_axfr.py b/tests/test_octodns_source_axfr.py
index a1d2e1c..8d0a527 100644
--- a/tests/test_octodns_source_axfr.py
+++ b/tests/test_octodns_source_axfr.py
@@ -9,6 +9,7 @@ import dns.zone
 from dns.exception import DNSException
 
 from mock import patch
+from shutil import copyfile
 from six import text_type
 from unittest import TestCase
 
@@ -21,7 +22,7 @@ from octodns.record import ValidationError
 class TestAxfrSource(TestCase):
     source = AxfrSource('test', 'localhost')
 
-    forward_zonefile = dns.zone.from_file('./tests/zones/unit.tests.',
+    forward_zonefile = dns.zone.from_file('./tests/zones/unit.tests.tst',
                                           'unit.tests', relativize=False)
 
     @patch('dns.zone.from_xfr')
@@ -44,7 +45,7 @@ class TestAxfrSource(TestCase):
 
 
 class TestZoneFileSource(TestCase):
-    source = ZoneFileSource('test', './tests/zones')
+    source = ZoneFileSource('test', './tests/zones', file_extension='tst')
 
     def test_zonefiles_with_extension(self):
         source = ZoneFileSource('test', './tests/zones', 'extension')
@@ -53,6 +54,14 @@ class TestZoneFileSource(TestCase):
         source.populate(valid)
         self.assertEquals(1, len(valid.records))
 
+    def test_zonefiles_without_extension(self):
+        copyfile('./tests/zones/unit.tests.tst', './tests/zones/unit.tests.')
+        source = ZoneFileSource('test', './tests/zones')
+        # Load zonefiles without a specified file extension
+        valid = Zone('unit.tests.', [])
+        source.populate(valid)
+        self.assertEquals(12, len(valid.records))
+
     def test_populate(self):
         # Valid zone file in directory
         valid = Zone('unit.tests.', [])
diff --git a/tests/zones/invalid.records. b/tests/zones/invalid.records.tst
similarity index 100%
rename from tests/zones/invalid.records.
rename to tests/zones/invalid.records.tst
diff --git a/tests/zones/invalid.zone. b/tests/zones/invalid.zone.tst
similarity index 100%
rename from tests/zones/invalid.zone.
rename to tests/zones/invalid.zone.tst
diff --git a/tests/zones/unit.tests. b/tests/zones/unit.tests.tst
similarity index 100%
rename from tests/zones/unit.tests.
rename to tests/zones/unit.tests.tst