← Back to branch summary

~ubuntu-branches/ubuntu/precise/keystone/precise-updates

« back to all changes in this revision

Viewing changes to tests/test_content_types.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-03-26 13:41:45 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20120326134145-watqz8s2rnx3l2hc
Tags: 2012.1~rc1-0ubuntu1
https://launchpad.net/bugs/959610
https://launchpad.net/bugs/948719
https://launchpad.net/bugs/956019
[Chuck Short]
* New usptream version.
* debian/control: Add python-iso8601 as a depends.
* debian/patches/fix-ubuntu-tests.patch: Disable git checkout on some
  of the tests.
* dropped swift as a depends.

[Adam Gandelman]
* debian/patches/sql_connection.patch: Refresh
* debian/logging.conf: Update and enable file logging (LP: #959610)
* debian/keystone.prerm: Only attempt to cleanup database if it was
  configured during installation. (LP: #948719)
* debian/rules: Fix doc builds + clean (LP: #956019)
* debian/control: Add python-{nova, swift} as Build-Depends, required
  for doc building
* debian/rules, debian/tests/test_overrides.conf: Setup a proper environment
  for unit testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_content_types.py
368
368
 
369
369
    def test_validate_token_belongs_to(self):
370
370
        token = self.get_scoped_token()
371
 
        path = ('/v2.0/tokens/%s?belongsTo=%s'
372
 
                 % (token, self.tenant_bar['name']))
373
 
        r = self.admin_request(path=path,token=token)
 
371
        path = ('/v2.0/tokens/%s?belongsTo=%s' % (token,
 
372
                                                  self.tenant_bar['id']))
 
373
        r = self.admin_request(path=path, token=token)
374
374
        self.assertValidAuthenticationResponse(r,
375
375
                                               require_service_catalog=True)
376
376