3 files changed, 60 insertions, 32 deletions
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 568fdc82..810b3592 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -346,6 +346,28 @@ class ODLTesting(unittest.TestCase):
                 self.test.main = mock.Mock(return_value=status)
             self.assertEqual(self.test.run(), status)
             self.test.main.assert_called_once_with(
+                odl.ODLTests.default_suites,
+                keystoneip=self._keystone_ip, neutronip=self._neutron_ip,
+                odlip=odlip, odlpassword=self._odl_password,
+                odlrestconfport=odlrestconfport,
+                odlusername=self._odl_username, odlwebport=odlwebport,
+                ospassword=self._os_password, ostenantname=self._os_tenantname,
+                osusername=self._os_username)
+
+    def _test_run_defining_multiple_suites(
+            self, suites,
+            status=testcase_base.TestcaseBase.EX_OK,
+            exception=None, odlip="127.0.0.3", odlwebport="8080",
+            odlrestconfport="8181"):
+        with mock.patch('functest.utils.openstack_utils.get_endpoint',
+                        side_effect=self._fake_url_for):
+            if exception:
+                self.test.main = mock.Mock(side_effect=exception)
+            else:
+                self.test.main = mock.Mock(return_value=status)
+            self.assertEqual(self.test.run(suites=suites), status)
+            self.test.main.assert_called_once_with(
+                suites,
                 keystoneip=self._keystone_ip, neutronip=self._neutron_ip,
                 odlip=odlip, odlpassword=self._odl_password,
                 odlrestconfport=odlrestconfport,
@@ -394,6 +416,14 @@ class ODLTesting(unittest.TestCase):
                        odlip=self._sdn_controller_ip,
                        odlwebport=self._odl_webport)
 
+    def test_run_redefining_suites(self):
+        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
+        self._test_run_defining_multiple_suites(
+            [odl.ODLTests.basic_suite_dir],
+            testcase_base.TestcaseBase.EX_OK,
+            odlip=self._sdn_controller_ip,
+            odlwebport=self._odl_webport)
+
     def test_run_fuel(self):
         os.environ["INSTALLER_TYPE"] = "fuel"
         self._test_run(testcase_base.TestcaseBase.EX_OK,
diff --git a/functest/tests/unit/test_logging.ini b/functest/tests/unit/test_logging.ini
index 3d5b947c..492767d1 100644
--- a/functest/tests/unit/test_logging.ini
+++ b/functest/tests/unit/test_logging.ini
@@ -1,27 +1,27 @@
-[loggers]
-keys=root,functest_logger
-
-[logger_root]
-level=DEBUG
-handlers=console
-
-[logger_functest_logger]
-level=DEBUG
-handlers=console
-qualname=functest.utils.functest_logger
-propagate=0
-
-[handlers]
-keys=console
-
-[handler_console]
-class=StreamHandler
-level=INFO
-formatter=standard
-args=(sys.stdout,)
-
-[formatters]
-keys=standard
-
-[formatter_standard]
+[loggers]
+keys=root,functest_logger
+
+[logger_root]
+level=DEBUG
+handlers=console
+
+[logger_functest_logger]
+level=DEBUG
+handlers=console
+qualname=functest.utils.functest_logger
+propagate=0
+
+[handlers]
+keys=console
+
+[handler_console]
+class=StreamHandler
+level=INFO
+formatter=standard
+args=(sys.stdout,)
+
+[formatters]
+keys=standard
+
+[formatter_standard]
 format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
 \ No newline at end of file
diff --git a/functest/tests/unit/utils/test_openstack_tacker.py b/functest/tests/unit/utils/test_openstack_tacker.py
index a8330c0e..dc717258 100644
--- a/functest/tests/unit/utils/test_openstack_tacker.py
+++ b/functest/tests/unit/utils/test_openstack_tacker.py
@@ -146,8 +146,7 @@ class OSTackerTesting(unittest.TestCase):
                                                 tosca_file=None)
             self.assertEqual(resp, self.createvnfd)
 
-    @mock.patch('functest.utils.openstack_tacker.logger.error')
-    def test_create_vnfd_default(self, mock_logger_error):
+    def test_create_vnfd_default(self):
         with mock.patch.object(self.tacker_client, 'create_vnfd',
                                return_value=self.createvnfd), \
                 mock.patch('__builtin__.open', mock.mock_open(read_data='1')) \
@@ -155,16 +154,15 @@ class OSTackerTesting(unittest.TestCase):
             resp = openstack_tacker.create_vnfd(self.tacker_client,
                                                 tosca_file=self.tosca_file)
             m.assert_called_once_with(self.tosca_file)
-            mock_logger_error.assert_called_once_with('1')
             self.assertEqual(resp, self.createvnfd)
 
-    @mock.patch('functest.utils.openstack_tacker.logger.exception')
-    def test_create_vnfd_exception(self, mock_logger_excep):
+    @mock.patch('functest.utils.openstack_tacker.logger.error')
+    def test_create_vnfd_exception(self, mock_logger_error):
         with mock.patch.object(self.tacker_client, 'create_vnfd',
                                side_effect=Exception):
             resp = openstack_tacker.create_vnfd(self.tacker_client,
                                                 tosca_file=self.tosca_file)
-            mock_logger_excep.assert_called_once_with(test_utils.
+            mock_logger_error.assert_called_once_with(test_utils.
                                                       SubstrMatch("Error"
                                                                   " [create"
                                                                   "_vnfd("