← Back to branch summary

~ubuntu-branches/ubuntu/raring/glance/raring-proposed

« back to all changes in this revision

Viewing changes to glance/tests/functional/v1/test_ssl.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2013-03-20 07:42:22 UTC
  • mfrom: (1.1.50)
  • Revision ID: package-import@ubuntu.com-20130320074222-d8oochgvhjooh1a5
Tags: 1:2013.1~rc1-0ubuntu1
[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org.

[ Chuck Short ]
* New upstrem release
* debian/control: Clean up build-dependencies:
  - Drop python-argparse referenced in pydist-overrides
  - Drop python-swift no longer needed.
  - Drop python-dateutils no longer needed.
  - Drop python-glacneclient no longer needed.
  - Added python-anyjson to build-depends.
  - Use python-keystoneclient instead of python-keystone.
  - Added python-lxml to build-depends.
  - Added python-swiftclientto build-depends.
  - Added python-passlib to build-depends.
* debian/rules: Set the PYTHONPATH for the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/tests/functional/v1/test_ssl.py
470
470
        self.start_servers(**self.__dict__.copy())
471
471
 
472
472
        versions = {'versions': [{
 
473
            "id": "v2.1",
 
474
            "status": "CURRENT",
 
475
            "links": [{
 
476
                "rel": "self",
 
477
                "href": "https://127.0.0.1:%d/v2/" % self.api_port}]}, {
473
478
            "id": "v2.0",
474
 
            "status": "CURRENT",
 
479
            "status": "SUPPORTED",
475
480
            "links": [{
476
481
                "rel": "self",
477
482
                "href": "https://127.0.0.1:%d/v2/" % self.api_port}]}, {