← Back to branch summary

~allenap/maas/regiond-leader

« back to all changes in this revision

Viewing changes to src/provisioningserver/dns/tests/test_actions.py

  • Committer: MAAS Lander
  • Author(s): Mike Pontillo
  • Date: 2015-04-29 07:38:54 UTC
  • mfrom: (3838.1.5 wip)
  • Revision ID: maas_lander-20150429073854-q9bkd825pyvfhcuk
[r=allenap][bug=1384334][author=mpontillo] Add configuration option for dnssec-validation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/dns/tests/test_actions.py
251
251
            factory.make_ipv4_address(),
252
252
            factory.make_ipv4_address(),
253
253
        ]
254
 
        actions.bind_write_options(upstream_dns=upstream_dns)
 
254
        dnssec_validation = random.choice(["auto", "yes", "no"])
 
255
        expected_dnssec_validation = dnssec_validation
 
256
        actions.bind_write_options(
 
257
            upstream_dns=upstream_dns, dnssec_validation=dnssec_validation)
255
258
        expected_options_file = join(
256
259
            self.dns_conf_dir, MAAS_NAMED_CONF_OPTIONS_INSIDE_NAME)
257
260
        self.assertThat(expected_options_file, FileExists())
261
264
            %s;
262
265
        };
263
266
 
 
267
        dnssec-validation %s;
 
268
 
264
269
        allow-query { any; };
265
270
        allow-recursion { trusted; };
266
271
        allow-query-cache { trusted; };
267
272
        """)
268
 
        expected_options_content %= tuple(upstream_dns)
 
273
        expected_options_content %= (
 
274
            tuple(upstream_dns) + (expected_dnssec_validation,))
 
275
 
269
276
        self.assertThat(
270
277
            expected_options_file,
271
278
            FileContains(expected_options_content))