commit e5ad25b85dcb5834ee26335f70215f6a8f004a20
author Sirushti Murugesan <sirushti.murugesan@hp.com> Sat Apr 18 23:30:59 2015 +0530
committer Sirushti Murugesan <sirushti.murugesan@hp.com> Tue May 05 19:54:00 2015 +0530
tree 6d0e2fdfb54419439343249a55ff1fee24c6cd93
parent 3a195a5579254fc871f037b3aeaf419f81c189a0

Prevent false positives of *_FAILED status

Closes-Bug: #1446098

Change-Id: I9bf182a1c9d83df1b6fcffa5713eceb5118aba6b

common/test.py

diff --git a/common/test.py b/common/test.py
index 6c70d83..9d351eb 100644
--- a/common/test.py
+++ b/common/test.py
@@ -234,7 +234,10 @@
             else:
                 if res.resource_status == status:
                     return
-                if fail_regexp.search(res.resource_status):
+                wait_for_action = status.split('_')[0]
+                resource_action = res.resource_status.split('_')[0]
+                if (resource_action == wait_for_action and
+                        fail_regexp.search(res.resource_status)):
                     raise exceptions.StackResourceBuildErrorException(
                         resource_name=res.resource_name,
                         stack_identifier=stack_identifier,
@@ -259,7 +262,9 @@
             else:
                 return True
 
-        if fail_regexp.search(stack.stack_status):
+        wait_for_action = status.split('_')[0]
+        if (stack.action == wait_for_action and
+                fail_regexp.search(stack.stack_status)):
             # Handle UPDATE_FAILED case.
             if status == 'UPDATE_FAILED':
                 if self.updated_time.get(