From 1d4d51b218ed14b85d1e46d3e7142fb52ea179d5 Mon Sep 17 00:00:00 2001 From: Darrell Bishop Date: Fri, 28 Jun 2013 21:26:54 -0700 Subject: Allow storage url override for both auth vers. When --os-storage-url is specified on the command-line to bin/swift, it will override the used storage URL regardless of authentication for both authentication version 1 and version 2. This can be used to bypass a load-balancer to hit a specific proxy server for testing/debugging purposes. Within the client library, this feature is accessed by passing the desired storage URL into swiftclient.client.Conection.__init__() via the os_options keyword argument. For example: conn = Connection(auth_url, user, key, os_options={ 'object_storage_url': 'http://overridden.storage.url/AUTH_foo'}) This patch also adds a dependency on mock>=0.8.0, which is the same as openstack/swift. Change-Id: Id2a36ed6abffd65e7762b6beea5bbfc6c036e848 --- tests/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index 8b5fbb2..07776b1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -38,7 +38,7 @@ def fake_get_keystoneclient_2_0(os_options, exc=None, **kwargs): from swiftclient import client as c raise c.ClientException("unverified-certificate") - return ("http://url/", "token") + return "http://url/", "token" return fake_get_keystoneclient_2_0 -- cgit v1.2.1