← Back to branch summary

~ubuntu-branches/ubuntu/saucy/heat/saucy

« back to all changes in this revision

Viewing changes to heat/tests/test_engine_api_utils.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-09-08 21:51:19 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130908215119-r939tu4aumqgdrkx
Tags: 2013.2~b3-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/control: Add python-netaddr as build-dep.
* debian/heat-common.install: Remove heat-boto and associated man-page
* debian/heat-common.install: Remove heat-cfn and associated man-page
* debian/heat-common.install: Remove heat-watch and associated man-page
* debian/patches/fix-sqlalchemy-0.8.patch: Dropped

[ Adam Gandelman ]
* debian/patches/default-kombu.patch: Dropped.
* debian/patches/default-sqlite.patch: Refreshed.
* debian/*.install, rules: Install heat.conf.sample as common
  config file in heat-common. Drop other per-package configs, they
  are no longer used.
* debian/rules: Clean pbr .egg from build dir if it exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_engine_api_utils.py
19
19
from heat.rpc import api as rpc_api
20
20
from heat.tests.common import HeatTestCase
21
21
from heat.tests import generic_resource as generic_rsrc
22
 
from heat.tests.utils import dummy_context
23
 
from heat.tests.utils import setup_dummy_db
 
22
from heat.tests import utils
24
23
 
25
24
 
26
25
class EngineApiTest(HeatTestCase):
83
82
 
84
83
    def setUp(self):
85
84
        super(FormatTest, self).setUp()
86
 
        setup_dummy_db()
 
85
        utils.setup_dummy_db()
87
86
 
88
87
        template = parser.Template({
89
88
            'Resources': {
95
94
        })
96
95
        resource._register_class('GenericResourceType',
97
96
                                 generic_rsrc.GenericResource)
98
 
        self.stack = parser.Stack(dummy_context(), 'test_stack', template,
99
 
                                  stack_id=uuidutils.generate_uuid())
 
97
        self.stack = parser.Stack(utils.dummy_context(), 'test_stack',
 
98
                                  template, stack_id=uuidutils.generate_uuid())
100
99
 
101
100
    def test_format_stack_resource(self):
102
101
        res = self.stack['generic1']