From 08ba9dbc0cbe2f19ef7c26a09f6fe4b2f6c207d9 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Thu, 31 Oct 2019 09:51:37 +0100 Subject: [PATCH] When image is None, image ID has to be reported as None Change-Id: I893bc5bdeee11c64c3850f8dd2a36a31fe79a8a4 --- tobiko/openstack/glance/_image.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tobiko/openstack/glance/_image.py b/tobiko/openstack/glance/_image.py index 3ce31d70d..6eafe5046 100644 --- a/tobiko/openstack/glance/_image.py +++ b/tobiko/openstack/glance/_image.py @@ -163,8 +163,9 @@ class GlanceImageFixture(tobiko.SharedFixture): def check_image_status(self, image, expected_status): image_status = image and image.status or GlanceImageStatus.DELETED if image_status not in expected_status: + image_id = image and image.id or None raise InvalidGlanceImageStatus(image_name=self.image_name, - image_id=image.id, + image_id=image_id, actual_status=image_status, expected_status=expected_status)