diff options
| author | Luis Pabon <lpabon@redhat.com> | 2013-10-31 12:51:51 -0400 |
|---|---|---|
| committer | Peter Portante <pportant@redhat.com> | 2013-11-04 13:46:25 -0800 |
| commit | 2bd930bb442d29aab176651a27cee8dab0dee4eb (patch) | |
| tree | d34b4638cfd9af5682a51d53d7d6613d8a55eb9b /test/functional | |
| parent | 0c34fa6085f96666429cc1835f6d69854a70530b (diff) | |
Keystone Functional Tests
Functional tests using OpenStack Keystone Authentication. Tests
require the following:
1. Keystone server is running locally
2. Keystone server has been setup according to the test.conf
3. /mnt/gluster-object has the directories setup
Change-Id: I460471e549da91366cb817916ed5293c7e7adda4
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/6218
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/swift_test_client.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py index 2a161ac..9c4766e 100644 --- a/test/functional/swift_test_client.py +++ b/test/functional/swift_test_client.py @@ -1,4 +1,3 @@ -# Copyright (c) 2010-2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -155,13 +154,13 @@ class Connection(object): self.storage_host = x[2].split(':')[0] if ':' in x[2]: self.storage_port = int(x[2].split(':')[1]) - # Make sure storage_url is a string and not unicode, since + # Make sure storage_url and the storage_token are + # strings and not unicode, since # keystoneclient (called by swiftclient) returns them in # unicode and this would cause troubles when doing # no_safe_quote query. self.storage_url = str('/%s/%s' % (x[3], x[4])) - - self.storage_token = storage_token + self.storage_token = str(storage_token) self.http_connect() return self.storage_url, self.storage_token |