diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | novaclient/tests/functional/base.py | 10 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -16,6 +16,7 @@ ChangeLog novaclient/versioninfo *.egg *egg-info +.eggs # Files created by releasenotes build releasenotes/build diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py index 0b219035..263f7912 100644 --- a/novaclient/tests/functional/base.py +++ b/novaclient/tests/functional/base.py @@ -61,8 +61,16 @@ def pick_flavor(flavors): def pick_image(images): for image in images: - if image.name.startswith('cirros') and image.name.endswith('-uec'): + if image.name.startswith('cirros') and ( + image.name.endswith('-uec') or + image.name.endswith('-disk.img')): return image + + # We didn't find the specific cirros image we'd like to use, so just use + # the first available. + if images: + return images[0] + raise NoImageException() diff --git a/test-requirements.txt b/test-requirements.txt index 702e21bf..0734af81 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ keyring>=5.5.1 # MIT/PSF mock>=2.0 # BSD python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0 python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0 -python-glanceclient>=2.0.0 # Apache-2.0 +python-glanceclient!=2.4.0,>=2.0.0 # Apache-2.0 requests-mock>=1.0 # Apache-2.0 sphinx!=1.3b1,<1.3,>=1.2.1 # BSD os-client-config!=1.19.0,!=1.19.1,!=1.20.0,>=1.13.1 # Apache-2.0 |