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

« back to all changes in this revision

Viewing changes to heat/tests/test_api_cloudwatch.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:
23
23
import heat.api.cloudwatch.watch as watches
24
24
from heat.rpc import api as engine_api
25
25
from heat.tests.common import HeatTestCase
26
 
from heat.tests.utils import dummy_context
 
26
from heat.tests import utils
27
27
 
28
28
 
29
29
class WatchControllerTest(HeatTestCase):
37
37
        qs = "&".join(["=".join([k, str(params[k])]) for k in params])
38
38
        environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': qs}
39
39
        req = Request(environ)
40
 
        req.context = dummy_context()
 
40
        req.context = utils.dummy_context()
41
41
        return req
42
42
 
43
43
    # The tests
524
524
            bind_port = 8003
525
525
        cfgopts = DummyConfig()
526
526
        self.controller = watches.WatchController(options=cfgopts)
527
 
        self.controller.policy.policy_path = None
 
527
        self.controller.policy.enforcer.policy_path = (self.policy_path +
 
528
                                                       'deny_stack_user.json')
528
529
        self.addCleanup(self.m.VerifyAll)