From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 7 Dec 2016 18:16:02 +0000 (+0000)
Subject: Merge "libvirt: Mock imagebackend template funcs in ImageBackendFixture"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c106ff09d479c402549e8340b345358b45faa5bc;p=osstest%2Fopenstack-nova.git

Merge "libvirt: Mock imagebackend template funcs in ImageBackendFixture"
---

c106ff09d479c402549e8340b345358b45faa5bc
diff --cc nova/tests/unit/virt/libvirt/test_driver.py
index 022a94873b,5ce658d672..54baff7f12
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@@ -16211,26 -16160,16 +16210,24 @@@ class LibvirtDriverTestCase(test.NoDBTe
  
      def test_is_booted_from_volume(self):
          func = libvirt_driver.LibvirtDriver._is_booted_from_volume
 -        instance, disk_mapping = {}, {}
 +        bdm = []
 +        bdi = {'block_device_mapping': bdm}
 +
 +        self.assertFalse(func(bdi))
 +
 +        bdm.append({'boot_index': -1})
 +        self.assertFalse(func(bdi))
 +
 +        bdm.append({'boot_index': None})
 +        self.assertFalse(func(bdi))
  
 -        self.assertTrue(func(instance, disk_mapping))
 -        disk_mapping['disk'] = 'map'
 -        self.assertTrue(func(instance, disk_mapping))
 +        bdm.append({'boot_index': 1})
 +        self.assertFalse(func(bdi))
  
 -        instance['image_ref'] = 'uuid'
 -        self.assertFalse(func(instance, disk_mapping))
 +        bdm.append({'boot_index': 0})
 +        self.assertTrue(func(bdi))
  
      @mock.patch('nova.virt.libvirt.driver.imagebackend')
-     @mock.patch(
-         'nova.virt.libvirt.driver.LibvirtDriver._try_fetch_image_cache')
      @mock.patch('nova.virt.libvirt.driver.LibvirtDriver._inject_data')
      @mock.patch('nova.virt.libvirt.driver.imagecache')
      def test_data_not_injects_with_configdrive(self, mock_image, mock_inject,