Merge "Fix functional tests for Python 3.4"

2 files changed, 5 insertions, 4 deletions

diff --git a/functional/common/test.py b/functional/common/test.py
index 50d59fd1..2fc355f8 100644
--- a/functional/common/test.py
+++ b/functional/common/test.py
@@ -28,13 +28,14 @@ EXAMPLE_DIR = os.path.join(ROOT_DIR, 'examples')
 
 def execute(cmd, fail_ok=False, merge_stderr=False):
     """Executes specified command for the given action."""
-    cmdlist = shlex.split(cmd.encode('utf-8'))
+    cmdlist = shlex.split(cmd)
     result = ''
     result_err = ''
     stdout = subprocess.PIPE
     stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
     proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr)
     result, result_err = proc.communicate()
+    result = result.decode('utf-8')
     if not fail_ok and proc.returncode != 0:
         raise exceptions.CommandFailed(proc.returncode, cmd, result,
                                        result_err)
diff --git a/functional/tests/compute/v2/test_server.py b/functional/tests/compute/v2/test_server.py
index a6cc98e6..bd1b2a87 100644
--- a/functional/tests/compute/v2/test_server.py
+++ b/functional/tests/compute/v2/test_server.py
@@ -32,14 +32,14 @@ class ServerTests(test.TestCase):
     def get_flavor(cls):
         raw_output = cls.openstack('flavor list -f value -c ID')
         ray = raw_output.split('\n')
-        idx = len(ray)/2
+        idx = int(len(ray)/2)
         return ray[idx]
 
     @classmethod
     def get_image(cls):
         raw_output = cls.openstack('image list -f value -c ID')
         ray = raw_output.split('\n')
-        idx = len(ray)/2
+        idx = int(len(ray)/2)
         return ray[idx]
 
     @classmethod
@@ -49,7 +49,7 @@ class ServerTests(test.TestCase):
         except exceptions.CommandFailed:
             return ''
         ray = raw_output.split('\n')
-        idx = len(ray)/2
+        idx = int(len(ray)/2)
         return ' --nic net-id=' + ray[idx]
 
     @classmethod