← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/test_libvirt.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandleman, Chuck Short
  • Date: 2012-03-02 11:04:04 UTC
  • mfrom: (1.1.47)
  • Revision ID: package-import@ubuntu.com-20120302110404-fr230yakr8hov3dj
Tags: 2012.1~e4-0ubuntu1
https://launchpad.net/bugs/940780
[ Adam Gandleman ]
* debian/patches/libvirt-use-console-pipe.patch: Refreshed. 
* debain/nova-volume.upstart.in: Ensure lock directory is created
  (LP: #940780)
* debain/control: Fix nova-compute-$flavor Depends
* debian/control: Add python-iso8601 to python-nova Depends

[ Chuck Short ]
* debian/rules: Fix FTBFS.
* Merge Ubuntu/Debian packaging:
  - Thanks to Julien Danjou, Ghe Rivero, and Thomas Goirand
  - debian/copyright: Update copyright file.
  - debian/nova-api.init, debian/nova-compute.init,
    debian/nova-network.init, debian/nova-objectstore,
    debian/nova-scheduler, debian/nova-volume.init:
    Synchronize init scripts.
  - nova-common.install, debian/rules: Install policy.json
  - debian/rules, debian/nova-xcp-network.install,
    debian/nova-xcp-plugins.install, nova-xcp-plugins.postrm,
    debian/nova-xcp-plugins.doc, debian/nova-xcp-plugins.postinst,
    debian/README.xcp_and_openstack, debian/control,
    debian/ubuntu_xen-openvswitch-nova.rules,
    debian/patches/path-to-the-xenhost.conf-fixup.patch:
    Add Xen XCP support.
  - debian/control,
    debian/nova-compute-{kvm,lxc,qemu,xen,uml}.postinst: Make
    nova-compute a virtual package.
  - Dropped ubuntu_ubuntu_control_vars: We dont use it
* New upstream release.
* Dropped python-babel, it will be handled by langpacks.
* debian/patches/ec2-fixes.patch: Backport turnk fix for ec2
  permissions.
* debian/patches/path-to-the-xenhost.conf-fixup.patch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_libvirt.py
1050
1050
    def test_pre_block_migration_works_correctly(self):
1051
1051
        """Confirms pre_block_migration works correctly."""
1052
1052
        # Replace instances_path since this testcase creates tmpfile
1053
 
        tmpdir = tempfile.mkdtemp()
1054
 
        self.flags(instances_path=tmpdir)
1055
 
 
1056
 
        # Test data
1057
 
        instance_ref = db.instance_create(self.context, self.test_instance)
1058
 
        dummyjson = ('[{"path": "%s/disk", "disk_size": "10737418240",'
1059
 
                     ' "type": "raw", "backing_file": ""}]')
1060
 
 
1061
 
        # Preparing mocks
1062
 
        # qemu-img should be mockd since test environment might not have
1063
 
        # large disk space.
1064
 
        self.mox.ReplayAll()
1065
 
        conn = connection.LibvirtConnection(False)
1066
 
        conn.pre_block_migration(self.context, instance_ref,
1067
 
                                 dummyjson % tmpdir)
1068
 
 
1069
 
        self.assertTrue(os.path.exists('%s/%s/' %
1070
 
                                       (tmpdir, instance_ref.name)))
1071
 
 
1072
 
        shutil.rmtree(tmpdir)
 
1053
        with utils.tempdir() as tmpdir:
 
1054
            self.flags(instances_path=tmpdir)
 
1055
 
 
1056
            # Test data
 
1057
            instance_ref = db.instance_create(self.context, self.test_instance)
 
1058
            dummyjson = ('[{"path": "%s/disk", "disk_size": "10737418240",'
 
1059
                         ' "type": "raw", "backing_file": ""}]')
 
1060
 
 
1061
            # Preparing mocks
 
1062
            # qemu-img should be mockd since test environment might not have
 
1063
            # large disk space.
 
1064
            self.mox.ReplayAll()
 
1065
            conn = connection.LibvirtConnection(False)
 
1066
            conn.pre_block_migration(self.context, instance_ref,
 
1067
                                     dummyjson % tmpdir)
 
1068
 
 
1069
            self.assertTrue(os.path.exists('%s/%s/' %
 
1070
                                           (tmpdir, instance_ref.name)))
 
1071
 
1073
1072
        db.instance_destroy(self.context, instance_ref['id'])
1074
1073
 
1075
1074
    @test.skip_if(missing_libvirt(), "Test requires libvirt")
1926
1925
        libvirt_utils.mkfs('swap', '/my/swap/block/dev')
1927
1926
 
1928
1927
    def test_ensure_tree(self):
1929
 
        tmpdir = tempfile.mkdtemp()
1930
 
        try:
 
1928
        with utils.tempdir() as tmpdir:
1931
1929
            testdir = '%s/foo/bar/baz' % (tmpdir,)
1932
1930
            libvirt_utils.ensure_tree(testdir)
1933
1931
            self.assertTrue(os.path.isdir(testdir))
1934
 
        finally:
1935
 
            shutil.rmtree(tmpdir)
1936
1932
 
1937
1933
    def test_write_to_file(self):
1938
1934
        dst_fd, dst_path = tempfile.mkstemp()