Merge "Fix functional test 'test_scrubber_with_metadata_enc'"

openstack · Apr 22, 2013 · b56491f · b56491f
2 parents 0a15b32 + 1e49329
commit b56491f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/test_scrubber.py
@@ -249,7 +249,7 @@ def test_scrubber_with_metadata_enc(self):
         loc = StoreLocation({})
         loc.parse_uri(decrypted_uri)
 
-        self.assertEqual("swift+http", loc.scheme)
+        self.assertIn(loc.scheme, ("swift+http", "swift+https"))
         self.assertEqual(image['id'], loc.obj)
 
         self.wait_for_scrub(path)