From 1faad248f833735585aa8f6135babceb46fbb6f8 Mon Sep 17 00:00:00 2001
From: Emmanuel Cazenave <contact@emcaz.fr>
Date: Tue, 5 May 2015 12:31:22 +0200
Subject: [PATCH] X-Auth-Token should be a bytestring.

Change-Id: I2aa941d74883e17e9548b0144a4a2e2db33aba95
Closes-Bug: 1451773
---
 test/functional/swift_test_client.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py
index f68dc035f0..4d77bcced0 100644
--- a/test/functional/swift_test_client.py
+++ b/test/functional/swift_test_client.py
@@ -181,7 +181,11 @@ class Connection(object):
         self.storage_url = str('/%s/%s' % (x[3], x[4]))
         self.account_name = str(x[4])
         self.auth_user = auth_user
-        self.storage_token = storage_token
+        # With v2 keystone, storage_token is unicode.
+        # We want it to be string otherwise this would cause
+        # troubles when doing query with already encoded
+        # non ascii characters in its headers.
+        self.storage_token = str(storage_token)
         self.user_acl = '%s:%s' % (self.account, self.username)
 
         self.http_connect()