openstack/python-swiftclient
Code Issues Proposed changes

Make the function tests Python3-import friendly

Browse Source 
Change-Id: Ic73fc2a6f6712505eda71fa2e2e91ac680ced9a3
This commit is contained in:
Alex Gaynor 2014-05-07 07:24:16 -07:00
parent 4e85183019
commit 30244399dd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/functional/test_swiftclient.py
View File

@ -13,13 +13,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import ConfigParser
import os import os
import StringIO
import testtools import testtools
import time import time
import types import types
import unittest import unittest
from io import BytesIO
from six.moves import configparser
import swiftclient import swiftclient
@ -31,7 +32,7 @@ class TestFunctional(testtools.TestCase):
self.skip_tests = False self.skip_tests = False
self._get_config() self._get_config()
self.test_data = '42' * 10 self.test_data = b'42' * 10
self.etag = '2704306ec982238d85d4b235c925d58e' self.etag = '2704306ec982238d85d4b235c925d58e'
self.containername = "functional-tests-container-%s" % int(time.time()) self.containername = "functional-tests-container-%s" % int(time.time())
@ -43,7 +44,7 @@ class TestFunctional(testtools.TestCase):
def _get_config(self): def _get_config(self):
config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE', config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE',
'/etc/swift/test.conf') '/etc/swift/test.conf')
config = ConfigParser.SafeConfigParser({'auth_version': '1'}) config = configparser.SafeConfigParser({'auth_version': '1'})
config.read(config_file) config.read(config_file)
if config.has_section('func_test'): if config.has_section('func_test'):
auth_host = config.get('func_test', 'auth_host') auth_host = config.get('func_test', 'auth_host')
@ -220,7 +221,7 @@ class TestFunctional(testtools.TestCase):
self.assertEqual('application/octet-stream', hdrs.get('content-type')) self.assertEqual('application/octet-stream', hdrs.get('content-type'))
# Content from File-like object # Content from File-like object
fileobj = StringIO.StringIO(self.test_data) fileobj = BytesIO(self.test_data)
self.conn.put_object( self.conn.put_object(
self.containername, self.objectname, contents=fileobj) self.containername, self.objectname, contents=fileobj)
hdrs = self.conn.head_object(self.containername, self.objectname) hdrs = self.conn.head_object(self.containername, self.objectname)
@ -230,7 +231,7 @@ class TestFunctional(testtools.TestCase):
self.assertEqual('application/octet-stream', hdrs.get('content-type')) self.assertEqual('application/octet-stream', hdrs.get('content-type'))
# Content from File-like object, but read in chunks # Content from File-like object, but read in chunks
fileobj = StringIO.StringIO(self.test_data) fileobj = BytesIO(self.test_data)
self.conn.put_object( self.conn.put_object(
self.containername, self.objectname, self.containername, self.objectname,
contents=fileobj, content_length=len(self.test_data), contents=fileobj, content_length=len(self.test_data),