Ignore image_dir when image_file is a path
Change-Id: I50539a50cfa2053a01837012a725baaea8aa20cb
This commit is contained in:
parent
652c9696a8
commit
b6d63c401e
@ -325,6 +325,8 @@ class FileGlanceImageFixture(UploadGlanceImageFixture):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def real_image_file(self):
|
def real_image_file(self):
|
||||||
|
if '/' in self.image_file:
|
||||||
|
return os.path.expanduser(self.image_file)
|
||||||
return os.path.join(self.real_image_dir, self.image_file)
|
return os.path.join(self.real_image_dir, self.image_file)
|
||||||
|
|
||||||
def get_image_data(self):
|
def get_image_data(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user