diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-23 05:41:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-23 05:41:52 +0000 |
| commit | d12c19c504357de718c262fc2d3d203fc3345a4d (patch) | |
| tree | 4e446ad1b59768ce58a646289d9f34480f792cb5 | |
| parent | 6b4c8694405239b36c182c55d1bc7e5ea6a161fc (diff) | |
| parent | a81a99c52b0aca4f30890d0ef5af14bc27eae524 (diff) | |
| download | heat-5.0.0.0rc1.tar.gz | |
Merge "py34: heat.tests.mistral/convergence"5.0.0.0rc1
| -rw-r--r-- | heat/tests/convergence/framework/engine_wrapper.py | 4 | ||||
| -rw-r--r-- | heat/tests/mistral/test_mistral_workflow.py | 9 | ||||
| -rw-r--r-- | py3-testlist | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/heat/tests/convergence/framework/engine_wrapper.py b/heat/tests/convergence/framework/engine_wrapper.py index 7ca3a4785..a76af6409 100644 --- a/heat/tests/convergence/framework/engine_wrapper.py +++ b/heat/tests/convergence/framework/engine_wrapper.py @@ -11,6 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from heat.db import api as db_api from heat.engine import service from heat.engine import stack @@ -37,7 +39,7 @@ class Engine(message_processor.MessageProcessor): ''' hot_tmpl = {"heat_template_version": "2013-05-23"} resources = {} - for res_name, res_def in scenario_tmpl.resources.iteritems(): + for res_name, res_def in six.iteritems(scenario_tmpl.resources): props = getattr(res_def, 'properties') depends = getattr(res_def, 'depends_on') res_defn = {"type": "OS::Heat::TestResource"} diff --git a/heat/tests/mistral/test_mistral_workflow.py b/heat/tests/mistral/test_mistral_workflow.py index 6af2617cf..bf5aceca1 100644 --- a/heat/tests/mistral/test_mistral_workflow.py +++ b/heat/tests/mistral/test_mistral_workflow.py @@ -507,16 +507,21 @@ class TestMistralWorkflow(common.HeatTestCase): details = {'input': '3'} err = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(wf.signal, details)) + if six.PY3: + entity = 'class' + else: + entity = 'type' error_message = ("StackValidationFailed: resources.create_vm: " "Signal data error: Input in" - " signal data must be a map, find a <type 'str'>") + " signal data must be a map, find a <%s 'str'>" % + entity) self.assertEqual(error_message, six.text_type(err)) details = {'params': '3'} err = self.assertRaises(exception.ResourceFailure, scheduler.TaskRunner(wf.signal, details)) error_message = ("StackValidationFailed: resources.create_vm: " "Signal data error: Params " - "must be a map, find a <type 'str'>") + "must be a map, find a <%s 'str'>" % entity) self.assertEqual(error_message, six.text_type(err)) def test_signal_wrong_input_key(self): diff --git a/py3-testlist b/py3-testlist index a9665c607..65b7a4afd 100644 --- a/py3-testlist +++ b/py3-testlist @@ -67,6 +67,7 @@ heat.tests.manila.test_manila_share heat.tests.manila.test_manila_share_type heat.tests.manila.test_share_network heat.tests.mistral.test_mistral_cron_trigger +heat.tests.mistral.test_mistral_workflow heat.tests.neutron heat.tests.neutron.test_extraroute heat.tests.neutron.test_neutron @@ -99,6 +100,7 @@ heat.tests.test_common_policy heat.tests.test_common_serializers heat.tests.test_common_service_utils heat.tests.test_constraints +heat.tests.test_convg_stack heat.tests.test_crypt heat.tests.test_cw_alarm heat.tests.test_dbinstance |