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

5 files changed, 8 insertions, 7 deletions

diff --git a/openstackclient/tests/functional/compute/v2/test_agent.py b/openstackclient/tests/functional/compute/v2/test_agent.py
index 1a112e82..25d8c868 100644
--- a/openstackclient/tests/functional/compute/v2/test_agent.py
+++ b/openstackclient/tests/functional/compute/v2/test_agent.py
@@ -21,10 +21,10 @@ class ComputeAgentTests(base.TestCase):
 
     # Generate two different md5hash
     MD5HASH1 = hashlib.md5()
-    MD5HASH1.update('agent_1')
+    MD5HASH1.update('agent_1'.encode('utf-8'))
     MD5HASH1 = MD5HASH1.hexdigest()
     MD5HASH2 = hashlib.md5()
-    MD5HASH2.update('agent_2')
+    MD5HASH2.update('agent_2'.encode('utf-8'))
     MD5HASH2 = MD5HASH2.hexdigest()
 
     def test_compute_agent_delete(self):
diff --git a/openstackclient/tests/functional/compute/v2/test_keypair.py b/openstackclient/tests/functional/compute/v2/test_keypair.py
index 9a88e66f..42f334a4 100644
--- a/openstackclient/tests/functional/compute/v2/test_keypair.py
+++ b/openstackclient/tests/functional/compute/v2/test_keypair.py
@@ -88,7 +88,7 @@ class KeypairTests(KeypairBase):
         1) Create keypair with given public key
         2) Delete keypair
         """
-        with tempfile.NamedTemporaryFile() as f:
+        with tempfile.NamedTemporaryFile(mode='w+') as f:
             f.write(self.PUBLIC_KEY)
             f.flush()
 
@@ -108,7 +108,7 @@ class KeypairTests(KeypairBase):
         1) Create keypair with private key file
         2) Delete keypair
         """
-        with tempfile.NamedTemporaryFile() as f:
+        with tempfile.NamedTemporaryFile(mode='w+') as f:
             cmd_output = json.loads(self.openstack(
                 'keypair create -f json --private-key %s tmpkey' % f.name,
             ))
diff --git a/openstackclient/tests/functional/identity/v2/common.py b/openstackclient/tests/functional/identity/v2/common.py
index f4bc10bd..43c0cbf2 100644
--- a/openstackclient/tests/functional/identity/v2/common.py
+++ b/openstackclient/tests/functional/identity/v2/common.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import os
+import unittest
 
 import fixtures
 from tempest.lib.common.utils import data_utils
@@ -62,7 +63,7 @@ class IdentityTests(base.TestCase):
             # TODO(dtroyer): Actually determine if Identity v2 admin is
             #                enabled in the target cloud.  Tuens out OSC
             #                doesn't make this easy as it should (yet).
-            raise cls.skipException('No Identity v2 admin endpoint?')
+            raise unittest.case.SkipTest('No Identity v2 admin endpoint?')
 
     @classmethod
     def tearDownClass(cls):
diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py
index 43b416aa..86f090bc 100644
--- a/openstackclient/tests/functional/identity/v3/common.py
+++ b/openstackclient/tests/functional/identity/v3/common.py
@@ -360,7 +360,7 @@ class IdentityTests(base.TestCase):
 
     def _extract_value_from_items(self, key, items):
         for d in items:
-            for k, v in d.iteritems():
+            for k, v in d.items():
                 if k == key:
                     return v
 
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)