openinfra/python-tempestconf
Code Issues Proposed changes

Merge "Allow non admin users to upload image to glance"

Browse Source
This commit is contained in:
Zuul
2018-06-13 10:56:12 +00:00
committed by Gerrit Code Review
parent a27aa23a92 a5c6dc0977
commit cf2b33b5df
7 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config_tempest/tests/services/test_image.py
View File

@@ -36,14 +36,14 @@ class TestImageService(BaseServiceTest):
self.FAKE_URL,
self.FAKE_TOKEN,
disable_ssl_validation=False)
self.Service.allow_creation = False
self.Service.image_path = "my_path/my_image.qcow2"
self.Service.disk_format = ".format"
self.Service.non_admin = False
self.Service.client = self.FakeServiceClient()
self.dir = "/img/"
self.conf = TempestConf()
self.conf.set("scenario", "img_dir", self.dir)
self.conf.set("image", "http_image", "my_image.qcow2")
@mock.patch('config_tempest.services.image.ImageService'
'.find_or_upload_image')
@@ -68,7 +68,6 @@ class TestImageService(BaseServiceTest):
image_source = format + "://any_random_url"
image_dest = "my_dest"
image_name = "my_image"
self.Service.allow_creation = True
image_id = self.Service.find_or_upload_image(
image_id=None, image_dest=image_dest,
image_name=image_name, image_source=image_source)
@@ -143,7 +142,6 @@ class TestImageService(BaseServiceTest):
image_source = "ftp://any_random_url"
image_dest = "place_on_disk"
image_name = "my_image"
self.Service.allow_creation = True
image_id = self.Service.find_or_upload_image(
image_id=None, image_name=image_name,
image_source=image_source, image_dest=image_dest)