openstack/heat
Code Issues Proposed changes

Fix test_update_restricted timeouts due to timestamp resolution

Browse Source 
Updating a stack where the only resource needs replacement but is
restricted from being replaced is *very* fast. Since the test framework
relies on seeing a change in the updated_time timestamp, which has only 1s
resolution, it can easily be missed causing the test to timeout. This adds
a 1s sleep between updates that have the same expected status to ensure
that the timestamp changes.

Change-Id: Ief845a21108e925325b1b3e8f090038ccdf73b8e
Closes-Bug: #1554375
Related-Bug: #1583630
This commit is contained in:
Zane Bitter 2016-06-14 15:09:19 +02:00 committed by Rabi Mishra
parent 9722a78840
commit c85cae58bf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat_integrationtests/functional/test_update_restricted.py
View File

@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import time
from heat_integrationtests.functional import functional_base from heat_integrationtests.functional import functional_base
test_template = { test_template = {
@ -105,6 +107,9 @@ class UpdateRestrictedStackTest(functional_base.FunctionalTestsBase):
self._check_for_restriction_reason(resource_events, self._check_for_restriction_reason(resource_events,
reason_replace_restrict)) reason_replace_restrict))
# Ensure the timestamp changes, since this will be very quick
time.sleep(1)
# check replace fails - with only 'replace' restricted # check replace fails - with only 'replace' restricted
self.update_stack(stack_identifier, update_template, self.update_stack(stack_identifier, update_template,
env_replace_restrict, env_replace_restrict,
@ -139,6 +144,9 @@ class UpdateRestrictedStackTest(functional_base.FunctionalTestsBase):
self._check_for_restriction_reason(resource_events, self._check_for_restriction_reason(resource_events,
reason_replace_restrict)) reason_replace_restrict))
# Ensure the timestamp changes, since this will be very quick
time.sleep(1)
# check replace fails - with only 'replace' restricted # check replace fails - with only 'replace' restricted
self.update_stack(stack_identifier, update_template, self.update_stack(stack_identifier, update_template,
env_replace_restrict, env_replace_restrict,