Lint utils/test

- Do not use `print` in unit tests, send messages through the test
framework instead.
- Remove unused import.
- Add spaces around equal sign in assigment.
- Turn method into a function.
- Reorganize imports according to PEP8.

4 files changed, 24 insertions, 26 deletions

diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py
index 0cb37eaff..067bb9de7 100644
--- a/utils/test/cli_installer_tests.py
+++ b/utils/test/cli_installer_tests.py
@@ -409,8 +409,7 @@ class UnattendedCliTests(OOCliFixture):
         result = self.runner.invoke(cli.cli, self.cli_args)
 
         if result.exception is None or result.exit_code != 1:
-            print("Exit code: %s" % result.exit_code)
-            self.fail("Unexpected CLI return")
+            self.fail("Unexpected CLI return. Exit code: %s" % result.exit_code)
 
     # unattended with config file and all installed hosts (with --force)
     @patch('ooinstall.openshift_ansible.run_main_playbook')
diff --git a/utils/test/fixture.py b/utils/test/fixture.py
index 5200d275d..873ac4a27 100644
--- a/utils/test/fixture.py
+++ b/utils/test/fixture.py
@@ -65,14 +65,13 @@ class OOCliFixture(OOInstallFixture):
 
     def assert_result(self, result, exit_code):
         if result.exit_code != exit_code:
-            print("Unexpected result from CLI execution")
-            print("Exit code: %s" % result.exit_code)
-            print("Exception: %s" % result.exception)
-            print(result.exc_info)
+            msg = ["Unexpected result from CLI execution\n"]
+            msg.append("Exit code: %s\n" % result.exit_code)
+            msg.append("Exception: %s\n" % result.exception)
             import traceback
-            traceback.print_exception(*result.exc_info)
-            print("Output:\n%s" % result.output)
-            self.fail("Exception during CLI execution")
+            msg.extend(traceback.format_exception(*result.exc_info))
+            msg.append("Output:\n%s" % result.output)
+            self.fail("".join(msg))
 
     def _verify_load_facts(self, load_facts_mock):
         """ Check that we ran load facts with expected inputs. """
diff --git a/utils/test/openshift_ansible_tests.py b/utils/test/openshift_ansible_tests.py
index 5847fe37b..02a9754db 100644
--- a/utils/test/openshift_ansible_tests.py
+++ b/utils/test/openshift_ansible_tests.py
@@ -2,7 +2,6 @@ import os
 import unittest
 import tempfile
 import shutil
-import yaml
 
 from six.moves import configparser
 
@@ -40,17 +39,10 @@ class TestOpenShiftAnsible(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.work_dir)
 
-    def generate_hosts(self, num_hosts, name_prefix, roles=None, new_host=False):
-        hosts = []
-        for num in range(1, num_hosts + 1):
-            hosts.append(Host(connect_to=name_prefix + str(num),
-                              roles=roles, new_host=new_host))
-        return hosts
-
     def test_generate_inventory_new_nodes(self):
-        hosts = self.generate_hosts(1, 'master', roles=(['master', 'etcd']))
-        hosts.extend(self.generate_hosts(1, 'node', roles=['node']))
-        hosts.extend(self.generate_hosts(1, 'new_node', roles=['node'], new_host=True))
+        hosts = generate_hosts(1, 'master', roles=(['master', 'etcd']))
+        hosts.extend(generate_hosts(1, 'node', roles=['node']))
+        hosts.extend(generate_hosts(1, 'new_node', roles=['node'], new_host=True))
         openshift_ansible.generate_inventory(hosts)
         inventory = configparser.ConfigParser(allow_no_value=True)
         inventory.read(self.inventory)
@@ -59,8 +51,8 @@ class TestOpenShiftAnsible(unittest.TestCase):
 
     def test_write_inventory_vars_role_vars(self):
         with open(self.inventory, 'w') as inv:
-            openshift_ansible.CFG.deployment.roles['master'].variables={'color': 'blue'}
-            openshift_ansible.CFG.deployment.roles['node'].variables={'color': 'green'}
+            openshift_ansible.CFG.deployment.roles['master'].variables = {'color': 'blue'}
+            openshift_ansible.CFG.deployment.roles['node'].variables = {'color': 'green'}
             openshift_ansible.write_inventory_vars(inv, None)
 
         inventory = configparser.ConfigParser(allow_no_value=True)
@@ -69,3 +61,11 @@ class TestOpenShiftAnsible(unittest.TestCase):
         self.assertEquals('blue', inventory.get('masters:vars', 'color'))
         self.assertTrue(inventory.has_section('nodes:vars'))
         self.assertEquals('green', inventory.get('nodes:vars', 'color'))
+
+
+def generate_hosts(num_hosts, name_prefix, roles=None, new_host=False):
+    hosts = []
+    for num in range(1, num_hosts + 1):
+        hosts.append(Host(connect_to=name_prefix + str(num),
+                          roles=roles, new_host=new_host))
+    return hosts
diff --git a/utils/test/test_utils.py b/utils/test/test_utils.py
index cbce64f7e..cabeaee34 100644
--- a/utils/test/test_utils.py
+++ b/utils/test/test_utils.py
@@ -2,14 +2,14 @@
 Unittests for ooinstall utils.
 """
 
-import six
 import unittest
-import logging
-import sys
 import copy
-from ooinstall.utils import debug_env, is_valid_hostname
 import mock
 
+import six
+
+from ooinstall.utils import debug_env, is_valid_hostname
+
 
 class TestUtils(unittest.TestCase):
     """