openstack/heat
Code Issues Proposed changes

Merge "Move TestResource in-tree"

Browse Source
This commit is contained in:
Jenkins
2015-09-04 10:31:55 +00:00
committed by Gerrit Code Review
parent 66725065b6 78a2bb63e1
commit b228f945cd
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
heat_integrationtests/common/test_resources/test_resource.py → heat/engine/resources/openstack/heat/test_resource.py
View File

@@ -27,15 +27,13 @@ LOG = logging.getLogger(__name__)
class TestResource(resource.Resource):
'''
A resource which stores the string value that was provided.
"""A resource which stores the string value that was provided.
This resource is to be used only for testing.
It has control knobs such as 'update_replace', 'fail', 'wait_secs'
It has control knobs such as 'update_replace', 'fail', 'wait_secs'.
"""
'''
support_status = support.SupportStatus(version='2014.1')
support_status = support.SupportStatus(version='5.0.0')
ACTION_TIMES = (
CREATE_WAIT_SECS, UPDATE_WAIT_SECS, DELETE_WAIT_SECS

1
heat_integrationtests/pre_test_hook.sh
View File

@@ -28,7 +28,6 @@ fi
echo -e 'notification_driver=messagingv2\n' >> $localconf
echo -e 'num_engine_workers=4\n' >> $localconf
echo -e 'plugin_dirs=$HEAT_DIR/heat_integrationtests/common/test_resources\n' >> $localconf
echo -e 'hidden_stack_tags=hidden\n' >> $localconf
echo -e 'encrypt_parameters_and_properties=True\n' >> $localconf