← Back to branch summary

~ubuntu-branches/ubuntu/raring/horizon/raring

« back to all changes in this revision

Viewing changes to openstack_dashboard/test/helpers.py

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Adam Gandelman
  • Date: 2013-03-20 11:20:17 UTC
  • mfrom: (1.1.25)
  • Revision ID: package-import@ubuntu.com-20130320112017-15h2zdnqy20lc089
Tags: 1:2013.1~rc1-0ubuntu1
https://launchpad.net/bugs/1130610
[ James Page ]
* New upstream release candidate for Grizzly:
  - Recompress static JS and CSS and generate new manifest.json for
    offline compression.
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org.
* d/control: Version python-compressor >= 1.2 (LP: #1130610).

[ Adam Gandelman ]
* debian/patches/ubuntu_local_settings.py: Refresh, specify memcache
  location as part of CACHES, as per upstream changes to example config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/test/helpers.py
277
277
    def stub_keystoneclient(self):
278
278
        if not hasattr(self, "keystoneclient"):
279
279
            self.mox.StubOutWithMock(keystone_client, 'Client')
 
280
            # NOTE(saschpe): Mock the 'auth_token' property specifically,
 
281
            # MockObject.__init__ ignores properties altogether:
 
282
            keystone_client.Client.auth_token = 'foo'
280
283
            self.keystoneclient = self.mox.CreateMock(keystone_client.Client)
281
284
        return self.keystoneclient
282
285