summaryrefslogtreecommitdiff
path: root/openstackclient/tests/common
diff options
context:
space:
mode:
authorCyril Roelandt <cyril.roelandt@enovance.com>2014-02-18 00:49:10 +0100
committerCyril Roelandt <cyril.roelandt@enovance.com>2014-02-18 00:49:10 +0100
commit5f9e7d09cb0c6efd01816253611092c1bbc51495 (patch)
treec7c435d285f23b1a7ef4bfff83224ec41df00470 /openstackclient/tests/common
parent2f5e8232aa07a9031231ad7b4678b7c52c1effc4 (diff)
downloadpython-openstackclient-5f9e7d09cb0c6efd01816253611092c1bbc51495.tar.gz
Python 3: the content of a FakeResponse must be bytes
Encode '_content' if necessary. Change-Id: I25c1e1cd5330f0519bf062be840045d0ef520b28
Diffstat (limited to 'openstackclient/tests/common')
-rw-r--r--openstackclient/tests/common/test_restapi.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/openstackclient/tests/common/test_restapi.py b/openstackclient/tests/common/test_restapi.py
index 2c1d5ddd..291818c1 100644
--- a/openstackclient/tests/common/test_restapi.py
+++ b/openstackclient/tests/common/test_restapi.py
@@ -19,6 +19,7 @@ import json
import mock
import requests
+import six
from openstackclient.common import restapi
from openstackclient.tests import utils
@@ -62,6 +63,8 @@ class FakeResponse(requests.Response):
self.headers.update(headers)
self._content = json.dumps(data)
+ if not isinstance(self._content, six.binary_type):
+ self._content = self._content.encode()
@mock.patch('openstackclient.common.restapi.requests.Session')