← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_debug_commands.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:
.pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_debug_commands.py
40
40
    def setUp(self):
41
41
        cfg.CONF.register_opts(interface.OPTS)
42
42
        cfg.CONF.register_opts(QuantumDebugAgent.OPTS)
43
 
        cfg.CONF(args=sys.argv, project='quantum')
 
43
        cfg.CONF(args=['quantum-debug'], project='quantum')
44
44
        cfg.CONF.set_override('use_namespaces', True)
45
45
        cfg.CONF.root_helper = 'sudo'
46
46
 
77
77
                     'mac_address': 'aa:bb:cc:dd:ee:ffa',
78
78
                     'network_id': 'fake_net',
79
79
                     'fixed_ips':
80
 
                     [{'subnet_id': 'fake_subnet', 'ip_address':'10.0.0.3'}]
 
80
                     [{'subnet_id': 'fake_subnet', 'ip_address': '10.0.0.3'}]
81
81
                     }}
82
82
        fake_ports = {'ports': [fake_port['port']]}
83
83
        self.fake_ports = fake_ports