← Back to branch summary

~ubuntu-branches/ubuntu/natty/nova/natty

« back to all changes in this revision

Viewing changes to nova/tests/test_virt.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short, Thierry Carrez
  • Date: 2011-02-25 14:01:06 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110225140106-0gfh4sof7wafe9ra
Tags: 2011.2~bzr740-0ubuntu1

[Chuck Short]
* New upstream release.

[Thierry Carrez]
* Add python-distutils-extra as build-dep (for i18n)
* Ship .mo files in /usr/share/locale
* Add lvdisplay to nova_sudoers, clean up dupe entries

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_virt.py
204
204
            conn = libvirt_conn.LibvirtConnection(True)
205
205
            uri = conn.get_uri()
206
206
            self.assertEquals(uri, testuri)
 
207
        db.instance_destroy(user_context, instance_ref['id'])
207
208
 
208
209
    def tearDown(self):
 
210
        self.manager.delete_project(self.project)
 
211
        self.manager.delete_user(self.user)
209
212
        super(LibvirtConnTestCase, self).tearDown()
210
 
        self.manager.delete_project(self.project)
211
 
        self.manager.delete_user(self.user)
212
213
 
213
214
 
214
215
class IptablesFirewallTestCase(test.TestCase):
365
366
                        '--dports 80:81 -j ACCEPT' % security_group_chain \
366
367
                            in self.out_rules,
367
368
                        "TCP port 80/81 acceptance rule wasn't added")
 
369
        db.instance_destroy(admin_ctxt, instance_ref['id'])
368
370
 
369
371
 
370
372
class NWFilterTestCase(test.TestCase):
388
390
    def tearDown(self):
389
391
        self.manager.delete_project(self.project)
390
392
        self.manager.delete_user(self.user)
 
393
        super(NWFilterTestCase, self).tearDown()
391
394
 
392
395
    def test_cidr_rule_nwfilter_xml(self):
393
396
        cloud_controller = cloud.CloudController()
514
517
        self.fw.apply_instance_filter(instance)
515
518
        _ensure_all_called()
516
519
        self.teardown_security_group()
 
520
        db.instance_destroy(admin_ctxt, instance_ref['id'])