summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional/object
diff options
context:
space:
mode:
authorEric Fried <openstack@fried.cc>2019-10-29 15:55:11 -0500
committerEric Fried <openstack@fried.cc>2019-10-31 00:17:35 +0000
commitf1d742f32adeb662a3fdf8fa3ef3bc391e71ed81 (patch)
treea6902ba864883a2e0315114f052968dc2c8c0d20 /openstackclient/tests/functional/object
parent45af14ca72b44c03f14189ac61a29253faf03bd7 (diff)
downloadpython-openstackclient-f1d742f32adeb662a3fdf8fa3ef3bc391e71ed81.tar.gz
Fix functional tests for py3
Fix various things so the functional tests will work under python3: - A hashlib.md5() can only be update()d with an encoded string in py3. - There's no dict.iteritems(), change to dict.items() (which is already an iterator). - Open temp files with 'w+' mode rather than the default 'w+b' (as an alternative to encoding all the write and expected-read payloads as bytes). - (This is a weird one) Explicitly raise SkipTest from unittest (rather than unittest2, which is where cls.skipException landed). Not sure why this is busted, but this moves the ball. Change-Id: Ic9b2b47848a600e87a3674289ae7ae8c3e091fee
Diffstat (limited to 'openstackclient/tests/functional/object')
-rw-r--r--openstackclient/tests/functional/object/v1/test_object.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/tests/functional/object/v1/test_object.py b/openstackclient/tests/functional/object/v1/test_object.py
index 226ef8ad..b3f23e52 100644
--- a/openstackclient/tests/functional/object/v1/test_object.py
+++ b/openstackclient/tests/functional/object/v1/test_object.py
@@ -33,7 +33,7 @@ class ObjectTests(common.ObjectStoreTests):
self.skipTest("No object-store service present")
def test_object(self):
- with tempfile.NamedTemporaryFile() as f:
+ with tempfile.NamedTemporaryFile(mode='w+') as f:
f.write('test content')
f.flush()
self._test_object(f.name)