← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/tests/test_imagebackend.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_imagebackend.py
17
17
 
18
18
import os
19
19
 
20
 
from nova import flags
 
20
from nova.openstack.common import cfg
 
21
from nova.openstack.common import fileutils
21
22
from nova import test
22
23
from nova.tests import fake_libvirt_utils
23
24
from nova.virt.libvirt import imagebackend
24
25
 
25
 
FLAGS = flags.FLAGS
 
26
CONF = cfg.CONF
26
27
 
27
28
 
28
29
class _ImageTestCase(test.TestCase):
41
42
        self.NAME = 'fake.vm'
42
43
        self.TEMPLATE = 'template'
43
44
 
44
 
        self.PATH = os.path.join(FLAGS.instances_path, self.INSTANCE,
 
45
        self.PATH = os.path.join(CONF.instances_path, self.INSTANCE,
45
46
                                 self.NAME)
46
 
        self.TEMPLATE_DIR = os.path.join(FLAGS.instances_path,
 
47
        self.TEMPLATE_DIR = os.path.join(CONF.instances_path,
47
48
                                         '_base')
48
49
        self.TEMPLATE_PATH = os.path.join(self.TEMPLATE_DIR, 'template')
49
50
 
56
57
        os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
57
58
        fn = self.mox.CreateMockAnything()
58
59
        fn(target=self.TEMPLATE_PATH)
59
 
        self.mox.StubOutWithMock(imagebackend.utils, 'ensure_tree')
60
 
        imagebackend.utils.ensure_tree(self.TEMPLATE_DIR)
 
60
        self.mox.StubOutWithMock(imagebackend.fileutils, 'ensure_tree')
 
61
        imagebackend.fileutils.ensure_tree(self.TEMPLATE_DIR)
61
62
        self.mox.ReplayAll()
62
63
 
63
64
        image = self.image_class(self.INSTANCE, self.NAME)
83
84
        os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
84
85
        fn = self.mox.CreateMockAnything()
85
86
        fn(target=self.TEMPLATE_PATH)
86
 
        self.mox.StubOutWithMock(imagebackend.utils, 'ensure_tree')
 
87
        self.mox.StubOutWithMock(imagebackend.fileutils, 'ensure_tree')
87
88
        self.mox.ReplayAll()
88
89
 
89
90
        image = self.image_class(self.INSTANCE, self.NAME)
117
118
 
118
119
    def prepare_mocks(self):
119
120
        fn = self.mox.CreateMockAnything()
120
 
        self.mox.StubOutWithMock(imagebackend.utils.synchronized, '__call__')
 
121
        self.mox.StubOutWithMock(imagebackend.lockutils.synchronized,
 
122
                                 '__call__')
121
123
        self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image')
122
124
        self.mox.StubOutWithMock(imagebackend.disk, 'extend')
123
125
        return fn
167
169
 
168
170
    def prepare_mocks(self):
169
171
        fn = self.mox.CreateMockAnything()
170
 
        self.mox.StubOutWithMock(imagebackend.utils.synchronized, '__call__')
 
172
        self.mox.StubOutWithMock(imagebackend.lockutils.synchronized,
 
173
                                 '__call__')
171
174
        self.mox.StubOutWithMock(imagebackend.libvirt_utils,
172
175
                                 'create_cow_image')
173
176
        self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image')