aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/utils/test_openstack_clean.py
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-06-23 05:11:31 +0000
committerLinda Wang <wangwulin@huawei.com>2017-06-24 02:21:35 +0000
commit5cfd8ce686f8b539d01a3e7e009e7d5a18b8228f (patch)
tree0b90754180bcbc4626e3961a3684811801aa53a3 /functest/tests/unit/utils/test_openstack_clean.py
parente62f0f289621c843e60f21f69a8e87e7d2778f36 (diff)
Use glance to list images
1. Images list is not supported by novaclient 8.0.0 2. It moves images list out of nova and into glance Change-Id: I2a2d40a2ca3a0cf1ebfb55697b3c58af8748a805 Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/tests/unit/utils/test_openstack_clean.py')
-rw-r--r--functest/tests/unit/utils/test_openstack_clean.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/functest/tests/unit/utils/test_openstack_clean.py b/functest/tests/unit/utils/test_openstack_clean.py
index fe7b50d45..5feed167c 100644
--- a/functest/tests/unit/utils/test_openstack_clean.py
+++ b/functest/tests/unit/utils/test_openstack_clean.py
@@ -672,6 +672,7 @@ class OSCleanTesting(unittest.TestCase):
RegexMatch(" Removing "
"\s*\S+..."))
+ @mock.patch('functest.utils.openstack_clean.os_utils.get_glance_client')
@mock.patch('functest.utils.openstack_clean.os_utils.get_cinder_client')
@mock.patch('functest.utils.openstack_clean.os_utils'
'.get_keystone_client')
@@ -684,7 +685,7 @@ class OSCleanTesting(unittest.TestCase):
@mock.patch('functest.utils.openstack_clean.logger.debug')
def test_main_default(self, mock_logger_debug, mock_logger_info,
mock_creds, mock_nova, mock_neutron,
- mock_keystone, mock_cinder):
+ mock_keystone, mock_cinder, mock_glance):
with mock.patch('functest.utils.openstack_clean.remove_instances') \
as mock_remove_instances, \