diff options
| author | huangtianhua <huangtianhua@huawei.com> | 2014-12-05 10:36:56 +0800 |
|---|---|---|
| committer | huangtianhua <huangtianhua@huawei.com> | 2015-01-13 03:11:33 +0000 |
| commit | 7588fdbb262295593201bee8b6b69ba60094acfa (patch) | |
| tree | 869740eba40ee914d7cdfb3c6dd5051d4bf524bf /heat/tests/test_metadata_refresh.py | |
| parent | c2bf586880807005fd8e762177988a38a85ef736 (diff) | |
| download | heat-7588fdbb262295593201bee8b6b69ba60094acfa.tar.gz | |
Split wait condition handle into separate files
Move OS::Heat::*Handle resource to
/resources/openstack/wait_condition_handle.py and move
AWS::CloudFormation::WaitConditionHandle resource to
/resources/aws/wait_condition_handle.py.
Change-Id: I2f7d34058356d381ffbf4f580316c9593492402c
Implements: blueprint decouple-aws-os-resources
Diffstat (limited to 'heat/tests/test_metadata_refresh.py')
| -rw-r--r-- | heat/tests/test_metadata_refresh.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index bfcb62a6e..06db2c068 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -19,9 +19,9 @@ from heat.common import identifier from heat.common import template_format from heat.engine import environment from heat.engine import parser +from heat.engine.resources.aws import wait_condition_handle as aws_wch from heat.engine.resources import instance from heat.engine.resources import server -from heat.engine.resources import wait_condition as wc from heat.engine import scheduler from heat.engine import service from heat.tests import common @@ -238,8 +238,8 @@ class WaitCondMetadataUpdateTest(common.HeatTestCase): id = identifier.ResourceIdentifier('test_tenant_id', stack.name, stack.id, '', 'WH') - self.m.StubOutWithMock(wc.WaitConditionHandle, 'identifier') - wc.WaitConditionHandle.identifier().MultipleTimes().AndReturn(id) + self.m.StubOutWithMock(aws_wch.WaitConditionHandle, 'identifier') + aws_wch.WaitConditionHandle.identifier().MultipleTimes().AndReturn(id) self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') return stack |