← Back to branch summary

~ubuntu-branches/ubuntu/raring/quantum/raring-proposed

« back to all changes in this revision

Viewing changes to quantum/tests/unit/test_linux_dhcp.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Yolanda Robla, James Page, Maru Newby
  • Date: 2013-01-11 09:14:35 UTC
  • mfrom: (2.1.17)
  • Revision ID: package-import@ubuntu.com-20130111091435-vaup7dwmtmajy5oe
Tags: 2013.1~g2-0ubuntu1
https://launchpad.net/bugs/1085038
https://launchpad.net/bugs/1076747
[ Chuck Short ]
* New upstream version. 
* debian/patches/fix-quantum-configuration.patch: Refreshed.

[ Yolanda Robla ]
* debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
  upstart configuration for Metadata Agent.
* debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
  quantum-metadata-agent and metadata_agent.ini.
* debian/patches/fix-quantum-configuration.patch: Update rootwrap
  configuration in metadata_agent.ini file.
* debian/changelog: Updated package version
* d/p/fix-quantum-configuration.patch: refresh patches

[ James Page ]
* d/*.install: Install entry points from bin directory instead
  of easy-install ones generated during the package build process
  (LP: #1085038).
* d/control: Drop BD on python-dev-all; its not required.
* d/rules: Install multiple upstart configurations for quantum-l3-agent.
* d/control: Tidy package descriptions.
* d/*.postrm: Drop as debhelper will generate update-rc.d calls in
  maintainer scripts if required.
* d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
  is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
  is owned by root:root.
* d/*agent*.postinst: Dropped as permissions now correctly set in
  quantum-common.
* d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and
  sqlite defaults for all plugins.
* d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1.

[ Maru Newby ]
* debian/control: Remove unnecessary openvswitch-vswitch dependency
  from quantum-plugin-openvswitch (LP: #1076747).

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/tests/unit/test_linux_dhcp.py
176
176
 
177
177
        c = SubClass()
178
178
        c.restart()
179
 
        self.assertEquals(c.called, ['disable True', 'enable'])
 
179
        self.assertEqual(c.called, ['disable True', 'enable'])
180
180
 
181
181
 
182
182
class LocalChild(dhcp.DhcpLocalProcess):
434
434
             'dnsmasq-lease-update'),
435
435
            '--leasefile-ro',
436
436
            '--dhcp-range=set:tag0,192.168.0.0,static,120s',
437
 
            '--dhcp-range=set:tag1,fdca:3ba5:a17a:4ba3::,static,120s'
 
437
            '--dhcp-range=set:tag1,fdca:3ba5:a17a:4ba3::,static,120s',
438
438
        ]
439
439
        expected.extend(extra_options)
440
440
 
466
466
                                                     check_exit_code=True)
467
467
 
468
468
    def test_spawn(self):
469
 
        self._test_spawn([])
 
469
        self._test_spawn(['--conf-file='])
470
470
 
471
471
    def test_spawn_cfg_config_file(self):
472
472
        self.conf.set_override('dnsmasq_config_file', '/foo')
474
474
 
475
475
    def test_spawn_cfg_dns_server(self):
476
476
        self.conf.set_override('dnsmasq_dns_server', '8.8.8.8')
477
 
        self._test_spawn(['--server=8.8.8.8'])
 
477
        self._test_spawn(['--conf-file=', '--server=8.8.8.8'])
478
478
 
479
479
    def test_output_opts_file(self):
480
480
        fake_v6 = 'gdca:3ba5:a17a:4ba3::1'