← Back to branch summary

~lutostag/ubuntu/trusty/maas/1.5.2

« back to all changes in this revision

Viewing changes to src/provisioningserver/dhcp/tests/test_config.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez, Andres Rodriguez, Julian Edwards, Dustin Kirkland
  • Date: 2014-03-28 10:43:53 UTC
  • mfrom: (1.2.26)
  • Revision ID: package-import@ubuntu.com-20140328104353-9hj74f1nvl7xis5z
Tags: 1.5+bzr2204-0ubuntu1
https://launchpad.net/bugs/1281881
https://launchpad.net/bugs/1299143
https://launchpad.net/bugs/1297097
* New upstream release (LP: #1281881)

[ Andres Rodriguez ]
* debian/maas-region-controller-min.templates: Set installation note to false
  by default.
* Check rabbitmqctl is present before running commands:
  - debian/maas-region-controller-min.maas-region-celery.upstart.
  - debian/maas-region-controller-min.maas-txlongpoll.upstart.
* make sure maas_longpoll rabbitmq user is created/with correct password on
  a package reconfigure.
* debian/maas-dns.postinst: Fix upgrade setup of named.conf.options.
* debian/maas-cluster-controller.install: Install UEFI templates (LP: #1299143)

[ Julian Edwards ]
* debian/extas/maas: Echo warning to stderr so json stdout is not polluted
* debian/maas-cluster-controller.postinst: Run upgrade-cluster on each
  upgrade
* debian/maas-dns.postinst: Call edit_named_options to add a line in
  /etc/bind/named.conf.options that includes the
  /etc/named/maas/named.conf.options.inside.maas file.
* debian/control:
  - maas-dns depends on python-iscpy
  - maas-cluster-controller depends on python-seamicroclient
* debian/maas-cluster-controller.install: Install bootresources.yaml

[ Dustin Kirkland ]
* debian/control: LP: #1297097
  - clean up package descriptions, modernize, and more clearly/simply
    explain what each package does
  - drop "Ubuntu" in front of MAAS, clean up command line/API description

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/dhcp/tests/test_config.py
22
22
 
23
23
from fixtures import EnvironmentVariableFixture
24
24
from maastesting.factory import factory
 
25
from provisioningserver.boot import BootMethodRegistry
25
26
from provisioningserver.dhcp import config
26
 
from provisioningserver.pxe.tftppath import compose_bootloader_path
27
27
from provisioningserver.testing.testcase import PservTestCase
28
28
import tempita
29
29
from testtools.matchers import (
114
114
                "subnet at line \d+ column \d+ "
115
115
                "in file %s" % template.name))
116
116
 
117
 
    def test_config_refers_to_bootloader(self):
 
117
    def test_compose_conditional_bootloader(self):
 
118
        output = config.compose_conditional_bootloader()
 
119
        for _, method in BootMethodRegistry:
 
120
            self.assertThat(output, Contains(method.arch_octet))
 
121
            self.assertThat(output, Contains(method.bootloader_path))
 
122
 
 
123
    def test_config_contains_compose_conditional_bootloader(self):
118
124
        params = make_sample_params()
119
 
        output = config.get_config(**params)
120
 
        self.assertThat(output, Contains(compose_bootloader_path()))
 
125
        bootloader = config.compose_conditional_bootloader()
 
126
        self.assertThat(config.get_config(**params), Contains(bootloader))
121
127
 
122
128
    def test_renders_without_ntp_servers_set(self):
123
129
        params = make_sample_params()