commit 9dfb907d9d3eb70164246cdd276c9fb7a41cc603
author Attila Fazekas <afazekas@redhat.com> Wed Nov 13 16:45:36 2013 +0100
committer Attila Fazekas <afazekas@redhat.com> Wed Nov 13 16:45:36 2013 +0100
tree bfd039629a2d68fb9cee0f21f11b178c044d7cf6
parent 0bafbd726417b275f76795fe40c35fe1315552ab

Fixing ImageKilledException raising

The wait method raised the exception with current status,
instead of the desired status.

Change-Id: Iab372023e18c71302b36ab17ae808857d9704b40

tempest/exceptions.py

diff --git a/tempest/exceptions.py b/tempest/exceptions.py
index 67406b0..02fc231 100644
--- a/tempest/exceptions.py
+++ b/tempest/exceptions.py
@@ -82,7 +82,7 @@
 
 
 class ImageKilledException(TempestException):
-    message = "Image %(image_id)s 'killed' while waiting for %(status)s"
+    message = "Image %(image_id)s 'killed' while waiting for '%(status)s'"
 
 
 class AddImageException(TempestException):

tempest/services/image/v1/json/image_client.py

diff --git a/tempest/services/image/v1/json/image_client.py b/tempest/services/image/v1/json/image_client.py
index b19f65d..0a7f0e2 100644
--- a/tempest/services/image/v1/json/image_client.py
+++ b/tempest/services/image/v1/json/image_client.py
@@ -270,7 +270,7 @@
 
             if value == 'killed':
                 raise exceptions.ImageKilledException(image_id=image_id,
-                                                      status=value)
+                                                      status=status)
             if dtime > self.build_timeout:
                 message = ('Time Limit Exceeded! (%ds)'
                            'while waiting for %s, '