3 files changed, 12 insertions, 11 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index cca198853..c3c53fbca 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -286,7 +286,7 @@ class RallyBase(testcase.TestCase):
                                self.excl_scenario()))
 
         if black_tests:
-            LOGGER.debug("Blacklisted tests: " + str(black_tests))
+            LOGGER.debug("Blacklisted tests: %s", str(black_tests))
 
         include = True
         for cases_line in cases_file:
@@ -358,9 +358,9 @@ class RallyBase(testcase.TestCase):
 
         # parse JSON operation result
         if self.task_succeed(json_results):
-            LOGGER.info('Test scenario: "{}" OK.'.format(test_name) + "\n")
+            LOGGER.info('Test scenario: "%s" OK.', test_name)
         else:
-            LOGGER.info('Test scenario: "{}" Failed.'.format(test_name) + "\n")
+            LOGGER.info('Test scenario: "%s" Failed.', test_name)
 
     def _run_task(self, test_name):
         """Run a task."""
@@ -369,7 +369,7 @@ class RallyBase(testcase.TestCase):
         task_file = os.path.join(self.RALLY_DIR, 'task.yaml')
         if not os.path.exists(task_file):
             LOGGER.error("Task file '%s' does not exist.", task_file)
-            raise Exception("Task file '%s' does not exist.", task_file)
+            raise Exception("Task file '{}' does not exist.".format(task_file))
 
         file_name = self._prepare_test_list(test_name)
         if self.file_is_empty(file_name):
diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py
index 8a88ac6b8..3a9c821d2 100644
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -12,12 +12,12 @@
 
 import unittest
 
+from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck
+from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
+
 from functest.opnfv_tests.openstack.snaps.snaps_test_runner import (
     SnapsTestRunner)
 
-from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
-from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck
-
 
 class HealthCheck(SnapsTestRunner):
     """
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index fa1005ea8..21d1dd60d 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -7,15 +7,16 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-"""Some common utils wrapping snaps functions """
+"""Some common utils wrapping snaps functions"""
+
+from snaps.openstack.tests import openstack_tests
+from snaps.openstack.utils import neutron_utils
+from snaps.openstack.utils import nova_utils
 
 from functest.utils import config
 from functest.utils import constants
 from functest.utils import env
 
-from snaps.openstack.tests import openstack_tests
-from snaps.openstack.utils import neutron_utils, nova_utils
-
 
 def get_ext_net_name(os_creds):
     """