← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily-proposed

« back to all changes in this revision

Viewing changes to heat/tests/test_multi_part.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-03-30 11:11:18 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20150330111118-2qpycylx6swu4yhj
Tags: 2015.1~b3-0ubuntu1
[ Corey Bryant ]
* New upstream milestone release for OpenStack kilo:
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

[ James Page ]
* d/p/fixup-assert-regex.patch: Tweak test to use assertRegexpMatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_multi_part.py
18
18
 
19
19
from heat.common import exception as exc
20
20
from heat.engine import parser
21
 
from heat.engine.resources.software_config import multi_part as mp
 
21
from heat.engine.resources.openstack.heat import multi_part as mp
22
22
from heat.engine import template
23
23
from heat.tests import common
24
24
from heat.tests import utils
58
58
        config_id = 'c8a19429-7fde-47ea-a42f-40045488226c'
59
59
        sc = {'id': config_id}
60
60
        self.rpc_client.create_software_config.return_value = sc
61
 
        self.config.id = uuid.uuid4().hex
 
61
        self.config.id = 55
 
62
        self.config.uuid = uuid.uuid4().hex
62
63
        self.config.handle_create()
63
64
        self.assertEqual(config_id, self.config.resource_id)
64
65
        kwargs = self.rpc_client.create_software_config.call_args[1]