From 77e80d6873f621b709c60e6eed13dd8c94eda910 Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@redhat.com>
Date: Sat, 7 Nov 2015 20:21:48 +0100
Subject: [PATCH] Split up test_is_volume_backed_instance() into five functions

test_is_volume_backed_instance() actually did five tests with
different object instances and test cases.  This is split up into
five separate functions with reasonable names.

Change-Id: Iba51e48413e2744ff789c8761bc9188238deb98b
---
 nova/tests/unit/compute/test_compute.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py
index d51dbdc44960..a39771febeb5 100644
--- a/nova/tests/unit/compute/test_compute.py
+++ b/nova/tests/unit/compute/test_compute.py
@@ -8929,19 +8929,24 @@ class ComputeAPITestCase(BaseTestCase):
         self.assertIsNone(
             self.compute_api._volume_size(inst_type, blank_bdm))
 
-    def test_is_volume_backed_instance(self):
+    def test_is_volume_backed_instance_no_image(self):
         ctxt = self.context
 
         instance = self._create_fake_instance_obj({'image_ref': ''})
         self.assertTrue(
             self.compute_api.is_volume_backed_instance(ctxt, instance, None))
 
+    def test_is_volume_backed_instance_no_bdm(self):
+        ctxt = self.context
         instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
         self.assertFalse(
             self.compute_api.is_volume_backed_instance(
                 ctxt, instance,
                 block_device_obj.block_device_make_list(ctxt, [])))
 
+    def test_is_volume_backed_instance_bdm_volume(self):
+        ctxt = self.context
+        instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
         bdms = block_device_obj.block_device_make_list(ctxt,
                             [fake_block_device.FakeDbBlockDeviceDict(
                                 {'source_type': 'volume',
@@ -8952,6 +8957,9 @@ class ComputeAPITestCase(BaseTestCase):
         self.assertTrue(
             self.compute_api.is_volume_backed_instance(ctxt, instance, bdms))
 
+    def test_is_volume_backed_instance_bdm_local(self):
+        ctxt = self.context
+        instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
         bdms = block_device_obj.block_device_make_list(ctxt,
                [fake_block_device.FakeDbBlockDeviceDict(
                 {'source_type': 'volume',
@@ -8970,6 +8978,9 @@ class ComputeAPITestCase(BaseTestCase):
         self.assertFalse(
             self.compute_api.is_volume_backed_instance(ctxt, instance, bdms))
 
+    def test_is_volume_backed_instance_bdm_snapshot(self):
+        ctxt = self.context
+        instance = self._create_fake_instance_obj({'root_device_name': 'vda'})
         bdms = block_device_obj.block_device_make_list(ctxt,
                [fake_block_device.FakeDbBlockDeviceDict(
                 {'source_type': 'volume',