From e50ce9c6e2763df3abadd74d18f6d9e54a6af1e7 Mon Sep 17 00:00:00 2001
From: Crag Wolfe <cwolfe@redhat.com>
Date: Thu, 4 May 2017 18:16:34 -0400
Subject: [PATCH] Bring back signal-related tests

Reverts I90e1d26a67a349f897d895f750d8e57fae98ec1f and
I116a96b20082d1c47068ddc64873200e9ae33a27 .

There have been a few changes that should enable these tests to
succeed on a regular basis, all related to edge cases around updating
a resource's atomic_key and metadata:

Corrected max secs for concurrent trans retries
e37d9fab8fe2e779ae8c0e2311de2601b66c66b6

Don't set metadata for deleted resources
8d7e3e41e8f02726dca33b5ec2f6d5b6b6b07a31

Allow retries when resource acquires lock
2ec2d5a973927f9a2cc2a62f70712afc5cb30f4c

Change-Id: I0fe508cf102bc1041a16c5ce1d9e384ecd591173
---
 heat_integrationtests/functional/test_os_wait_condition.py | 2 +-
 heat_integrationtests/prepare_test_env.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/heat_integrationtests/functional/test_os_wait_condition.py b/heat_integrationtests/functional/test_os_wait_condition.py
index 66b182b3cb..5c1783af7f 100644
--- a/heat_integrationtests/functional/test_os_wait_condition.py
+++ b/heat_integrationtests/functional/test_os_wait_condition.py
@@ -76,7 +76,7 @@ resources:
     type: OS::Heat::WaitCondition
     depends_on: instance1
     properties:
-      count: 12
+      count: 25
       handle: {get_resource: wait_handle}
       timeout: {get_param: timeout}
 
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index d6361470a8..8774313fb2 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -70,6 +70,6 @@ iniset $conf_file heat_plugin skip_functional_test_list 'CancelUpdateTest.test_c
 # Add scenario tests to skip
 # VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
 # test_server_signal_userdata_format_software_config is skipped untill bug #1651768 is resolved
-iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest, ServerSignalIntegrationTest.test_server_signal_userdata_format_software_config'
+iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
 
 cat $conf_file