glance functional test test_scrubber_with_metadata_enc failing

[John Lenihan]

This test is failing if I create a config file which points at at a real swift system and specify the config file in the GLANCE_TEST_SWIFT_CONF:

GLANCE_TEST_SWIFT_CONF=./glance-api.conf nosetests -v glance/tests/functional/test_scrubber.py

nose.config: INFO: Ignoring files matching ['^\\.', '^_', '^setup\\.py$']
nose.plugins.cover: INFO: Coverage report will include only packages: ['glance']
glance.tests.functional.test_scrubber.TestScrubber.test_delayed_delete ... ok
glance.tests.functional.test_scrubber.TestScrubber.test_scrubber_app ... ok
glance.tests.functional.test_scrubber.TestScrubber.test_scrubber_app_against_swift ... ok
glance.tests.functional.test_scrubber.TestScrubber.test_scrubber_with_metadata_enc ... FAIL

======================================================================
FAIL: glance.tests.functional.test_scrubber.TestScrubber.test_scrubber_with_metadata_enc
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/jenkins/QA_Automated_Tests_DEVQA2_master/workspace/DevQA_Glance_RnDA_Functional_Tests/glance/tests/functional/test_scrubber.py", line 291, in test_scrubber_with_metadata_enc
    self.assertEqual("swift+http", loc.scheme)
MismatchError: 'swift+http' != 'swift+https'

----------------------------------------------------------------------
Ran 4 tests in 52.483s

FAILED (failures=1)

The swift system I am using uses https.

The problem is this line:

self.assertEqual("swift+http", loc.scheme)

As is it doesn't allow for https.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/25147

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/25147
Committed: http://github.com/openstack/glance/commit/1e493292d5a6e5c4cf8d1319f854deb7d14b573b
Submitter: Jenkins
Branch: master

commit 1e493292d5a6e5c4cf8d1319f854deb7d14b573b
Author: John Lenihan <email address hidden>
Date: Fri Mar 22 16:03:30 2013 +0000

    Fix functional test 'test_scrubber_with_metadata_enc'

    This test fails if a real swift system is specified in a config file
    and passed to the tests via the GLANCE_TEST_SWIFT_CONF environment
    variable. The fix is to allow location schemes of the form
    'swift+http' as well as 'swift+https'.

    Fixes bug 1158805

    Change-Id: I9fd3a9c02b31acc2a8313acd3b88124a17d0adfb