Merge "Bind9 zone file should end with a new line"

designate/resources/templates/bind9-zone.jinja2

@@ -16,3 +16,4 @@ $TTL {{ domain.ttl }}
 {% for record in records %}
 {{record.name}} {{record.ttl or ''}} IN {{record.type}} {{record.priority or ''}} {{record.data}}
 {%- endfor %}
+

designate/tests/test_resources/test_templates/test_bind9.py

@@ -0,0 +1,28 @@
+# Copyright 2014 Cloudwatt
+#
+# Author: Jordan Pittier <jordan.pittier@cloudwatt.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+from designate.openstack.common import log as logging
+from designate.tests import TestCase
+from designate import utils
+
+
+LOG = logging.getLogger(__name__)
+
+
+class Bind9Test(TestCase):
+    def test_bind9_zone_ends_with_empty_line(self):
+        name = ['templates', 'bind9-zone.jinja2']
+        resource_string = utils.resource_string(*name)
+        self.assertEqual('\n\n', resource_string[-2:])

designate/tests/test_utils.py

@@ -54,6 +54,11 @@ class TestUtils(TestCase):
 
         self.assertIsInstance(template, Template)
 
+    def test_load_template_keep_trailing_newline(self):
+        name = 'bind9-config.jinja2'
+        template = utils.load_template(name)
+        self.assertTrue(template.environment.keep_trailing_newline)
+
     def test_load_template_missing(self):
         name = 'invalid.jinja2'
 

designate/utils.py

@@ -114,7 +114,7 @@ def load_schema(version, name):
 def load_template(template_name):
     template_string = resource_string('templates', template_name)
 
-    return Template(template_string)
+    return Template(template_string, keep_trailing_newline=True)
 
 
 def render_template(template, **template_context):