From d4a9cdb4f53f94cbfa3baa3209bbd58ac59ff2bf Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Thu, 22 Sep 2016 15:07:37 +0200
Subject: [PATCH] Wait for deletion_time in integration tests

When we check for DELETE_COMPLETE, we can have a window where the stack
is mark as such but without deletion_time. Let's wait for that
information.

Change-Id: Ia8c225aab8b0f118e99963fc22341d743e9182a1
Closes-Bug: #1625661
---
 heat_integrationtests/common/test.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py
index b9bb0362c5..b422012f96 100644
--- a/heat_integrationtests/common/test.py
+++ b/heat_integrationtests/common/test.py
@@ -285,6 +285,10 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
                         stack_identifier) != stack.updated_time:
                     self.updated_time[stack_identifier] = stack.updated_time
                     return True
+            elif status == 'DELETE_COMPLETE' and stack.deletion_time is None:
+                # Wait for deleted_time to be filled, so that we have more
+                # confidence the operation is finished.
+                return False
             else:
                 return True