| commit | bcba3faff45663cff419e2c149fc37bccb77dcf9 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Feb 18 03:04:06 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Feb 18 03:04:06 2014 +0000 |
| tree | cc2afc0754a834029beef8ce90e98169869a4f02 | |
| parent | ed9fdf1f993506a7de5b7486323c918b62ac7491 [diff] | |
| parent | e9674c3bca02213e104d6f9e9de1303d72aa0fc9 [diff] |
Merge "InputScenarioUtils load images if glance available"
diff --git a/tempest/common/utils/test_utils.py b/tempest/common/utils/test_utils.py index eca716e..2e23782 100644 --- a/tempest/common/utils/test_utils.py +++ b/tempest/common/utils/test_utils.py
@@ -112,6 +112,8 @@ """ :return: a scenario with name and uuid of images """ + if not CONF.service_available.glance: + return [] if not hasattr(self, '_scenario_images'): images = self.client.images.list(detailed=False) self._scenario_images = [