← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/tests/test_db_api.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Dave Walker (Daviey), Chuck Short
  • Date: 2012-02-17 10:59:59 UTC
  • mfrom: (1.1.45)
  • Revision ID: package-import@ubuntu.com-20120217105959-ut218n638vv7cre0
Tags: 2012.1~e4~20120217.12709-0ubuntu1
https://launchpad.net/bugs/929127
https://launchpad.net/bugs/923681
https://launchpad.net/bugs/932787
[ Dave Walker (Daviey) ]
* New upstream snapshot
* debian/patches/temp_fix_linux_net.patch:
  - Dropped, applied upstream. LP: #929127
* debian/patches/libvirt-use-console-pipe.patch:
  - Rebased against latest trunk

[ Chuck Short ]
* debian/nova.conf: Re-enable default iscsi_helper.
* debian/nova.conf: More fixups.
* debian/control: Dont depend and conflicts on nova-compute-
  hypervisor. (LP: #923681)
* debian/patches/libvirt-us-console-pipe.patch: Refreshed.
* Temporarily disable console patch. (LP: #932787)
* New usptream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_db_api.py
146
146
        db_network = db.network_get(ctxt, network.id)
147
147
        self.assertEqual(network.uuid, db_network.uuid)
148
148
 
 
149
    def test_network_create_with_duplicate_vlan(self):
 
150
        ctxt = context.get_admin_context()
 
151
        values1 = {'host': 'localhost', 'project_id': 'project1', 'vlan': 1}
 
152
        values2 = {'host': 'something', 'project_id': 'project1', 'vlan': 1}
 
153
        db.network_create_safe(ctxt, values1)
 
154
        self.assertRaises(exception.DuplicateVlan,
 
155
                          db.network_create_safe, ctxt, values2)
 
156
 
149
157
    def test_instance_update_with_instance_id(self):
150
158
        """ test instance_update() works when an instance id is passed """
151
159
        ctxt = context.get_admin_context()