Add python3 support in cli

Change-Id: I222fde91cf236a272176bc2d9ec6732f98b76141
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py
index 0e0afe5..c41f8f3 100644 (file)
--- a/functest/cli/commands/cli_env.py
+++ b/functest/cli/commands/cli_env.py
@@ -12,6 +12,8 @@ import prettytable
 
 from functest.utils.constants import CONST
 
+import six
+
 
 class Env(object):
 
@@ -52,7 +54,7 @@ class CliEnv(Env):
         msg = prettytable.PrettyTable(
             header_style='upper', padding_width=5,
             field_names=['Functest Environment', 'value'])
-        for key, value in env_info.iteritems():
+        for key, value in six.iteritems(env_info):
             if key is not None:
                 msg.add_row([key, value])
         click.echo(msg.get_string())

diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py
index 71cd78c..1ec705a 100644 (file)
--- a/functest/cli/commands/cli_os.py
+++ b/functest/cli/commands/cli_os.py
@@ -9,9 +9,10 @@
 
 
 import os
-from urlparse import urlparse
 
 import click
+import six
+from six.moves.urllib.parse import urlparse
 
 from functest.ci import check_deployment
 from functest.utils.constants import CONST
@@ -58,16 +59,18 @@ class OpenStack(object):
     def snapshot_create(self):
         self.ping_endpoint()
         if os.path.isfile(self.snapshot_file):
-            answer = raw_input("It seems there is already an OpenStack "
-                               "snapshot. Do you want to overwrite it with "
-                               "the current OpenStack status? [y|n]\n")
+            answer = six.moves.input(
+                "It seems there is already an OpenStack "
+                "snapshot. Do you want to overwrite it with "
+                "the current OpenStack status? [y|n]\n")
             while True:
                 if answer.lower() in ["y", "yes"]:
                     break
                 elif answer.lower() in ["n", "no"]:
                     return
                 else:
-                    answer = raw_input("Invalid answer. Please type [y|n]\n")
+                    answer = six.moves.input(
+                        "Invalid answer. Please type [y|n]\n")
 
         click.echo("Generating Openstack snapshot...")
         os_snapshot.main()

diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
index 806bc93..434370a 100644 (file)
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ b/functest/tests/unit/cli/commands/test_cli_os.py
@@ -82,7 +82,7 @@ class CliOpenStackTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_os.click.echo')
     def test_snapshot_create_overwrite(self, mock_click_echo, mock_os_path):
-        with mock.patch('__builtin__.raw_input', return_value="y") \
+        with mock.patch('six.moves.input', return_value="y") \
                 as mock_raw_input, \
                 mock.patch.object(self.cli_os, 'ping_endpoint'), \
                 mock.patch('functest.cli.commands.cli_os.os_snapshot.main') \
@@ -111,7 +111,8 @@ class CliOpenStackTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_os.click.echo')
     def test_snapshot_show_default(self, mock_click_echo, mock_os_path):
-        with mock.patch('__builtin__.open', mock.mock_open(read_data='0')) \
+        with mock.patch('six.moves.builtins.open',
+                        mock.mock_open(read_data='0')) \
                 as m:
             self.cli_os.snapshot_file = self.snapshot_file
             self.cli_os.snapshot_show()

diff --git a/tox.ini b/tox.ini
index 9d5988a..62bed4f 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -57,6 +57,7 @@ commands =
 [testenv:py35]
 dirs =
   functest/tests/unit/ci
+  functest/tests/unit/cli
   functest/tests/unit/core
   functest/tests/unit/energy
   functest/tests/unit/odl