diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-25 04:55:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-25 04:55:45 +0000 |
| commit | 46b1b6f1614d50189cc79e000543e2bc7ea67104 (patch) | |
| tree | b72c8e17a0bd47ca5cb9aca51e10eee7edb9d22d | |
| parent | 13fa09a373597bc577800fe31e5cb33190ce0243 (diff) | |
| parent | 0efbcf4e168d030907adbadd6ab7fccf766f4068 (diff) | |
| download | nova-46b1b6f1614d50189cc79e000543e2bc7ea67104.tar.gz | |
Merge "Return None from get_swap() if input is not swap"
| -rw-r--r-- | nova/tests/virt/test_block_device.py | 2 | ||||
| -rw-r--r-- | nova/virt/block_device.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/virt/test_block_device.py b/nova/tests/virt/test_block_device.py index a16ade1e4f..6ace591f3e 100644 --- a/nova/tests/virt/test_block_device.py +++ b/nova/tests/virt/test_block_device.py @@ -656,7 +656,7 @@ class TestDriverBlockDevice(test.NoDBTestCase): self.assertEqual(swap[0], driver_block_device.get_swap(swap)) self.assertEqual(legacy_swap[0], driver_block_device.get_swap(legacy_swap)) - self.assertEqual(no_swap, driver_block_device.get_swap(no_swap)) + self.assertIsNone(driver_block_device.get_swap(no_swap)) self.assertIsNone(driver_block_device.get_swap([])) def test_is_implemented(self): diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py index e58d6be1ea..339b353da8 100644 --- a/nova/virt/block_device.py +++ b/nova/virt/block_device.py @@ -446,7 +446,7 @@ def get_swap(transformed_list): if not all(isinstance(device, DriverSwapBlockDevice) or 'swap_size' in device for device in transformed_list): - return transformed_list + return None try: return transformed_list.pop() except IndexError: |