Switch from generate_report to PrettyTable

run_tests.py now relies on PrettyTable as most of the openstack clients.
generate_report.py and its related unit tests are simply removed.

It sets padding_width=5 in testcase.py too to conform with
run_tests.py.

Now report is printed in every case.

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

3 files changed, 5 insertions, 156 deletions

diff --git a/functest/tests/unit/ci/test_generate_report.py b/functest/tests/unit/ci/test_generate_report.py
deleted file mode 100644
index 2c5ce2ea..00000000
--- a/functest/tests/unit/ci/test_generate_report.py
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env python
-
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-import logging
-import unittest
-import urllib2
-
-import mock
-
-from functest.ci import generate_report as gen_report
-from functest.tests.unit import test_utils
-from functest.utils import functest_utils as ft_utils
-from functest.utils.constants import CONST
-
-
-class GenerateReportTesting(unittest.TestCase):
-
-    logging.disable(logging.CRITICAL)
-
-    def test_init(self):
-        test_array = gen_report.init()
-        self.assertEqual(test_array, [])
-
-    @mock.patch('functest.ci.generate_report.urllib2.urlopen',
-                side_effect=urllib2.URLError('no host given'))
-    def test_get_results_from_db_fail(self, mock_method):
-        url = "%s?build_tag=%s" % (ft_utils.get_db_url(),
-                                   CONST.__getattribute__('BUILD_TAG'))
-        self.assertIsNone(gen_report.get_results_from_db())
-        mock_method.assert_called_once_with(url)
-
-    @mock.patch('functest.ci.generate_report.urllib2.urlopen',
-                return_value={'results': []})
-    def test_get_results_from_db_success(self, mock_method):
-        url = "%s?build_tag=%s" % (ft_utils.get_db_url(),
-                                   CONST.__getattribute__('BUILD_TAG'))
-        self.assertEqual(gen_report.get_results_from_db(), None)
-        mock_method.assert_called_once_with(url)
-
-    def test_get_data(self):
-        self.assertIsInstance(gen_report.get_data({'result': ''}, ''), dict)
-
-    def test_print_line_with_ci_run(self):
-        CONST.__setattr__('IS_CI_RUN', True)
-        w1 = 'test_print_line'
-        test_str = ("| %s| %s| %s| %s| %s|\n"
-                    % (w1.ljust(gen_report.COL_1_LEN - 1),
-                       ''.ljust(gen_report.COL_2_LEN - 1),
-                       ''.ljust(gen_report.COL_3_LEN - 1),
-                       ''.ljust(gen_report.COL_4_LEN - 1),
-                       ''.ljust(gen_report.COL_5_LEN - 1)))
-        self.assertEqual(gen_report.print_line(w1), test_str)
-
-    def test_print_line_without_ci_run(self):
-        CONST.__setattr__('IS_CI_RUN', False)
-        w1 = 'test_print_line'
-        test_str = ("| %s| %s| %s| %s|\n"
-                    % (w1.ljust(gen_report.COL_1_LEN - 1),
-                       ''.ljust(gen_report.COL_2_LEN - 1),
-                       ''.ljust(gen_report.COL_3_LEN - 1),
-                       ''.ljust(gen_report.COL_4_LEN - 1)))
-        self.assertEqual(gen_report.print_line(w1), test_str)
-
-    def test_print_line_no_column_with_ci_run(self):
-        CONST.__setattr__('IS_CI_RUN', True)
-        TOTAL_LEN = gen_report.COL_1_LEN + gen_report.COL_2_LEN
-        TOTAL_LEN += gen_report.COL_3_LEN + gen_report.COL_4_LEN + 2
-        TOTAL_LEN += gen_report.COL_5_LEN + 1
-        test_str = ("| %s|\n" % 'test'.ljust(TOTAL_LEN))
-        self.assertEqual(gen_report.print_line_no_columns('test'), test_str)
-
-    def test_print_line_no_column_without_ci_run(self):
-        CONST.__setattr__('IS_CI_RUN', False)
-        TOTAL_LEN = gen_report.COL_1_LEN + gen_report.COL_2_LEN
-        TOTAL_LEN += gen_report.COL_3_LEN + gen_report.COL_4_LEN + 2
-        test_str = ("| %s|\n" % 'test'.ljust(TOTAL_LEN))
-        self.assertEqual(gen_report.print_line_no_columns('test'), test_str)
-
-    def test_print_separator_with_ci_run(self):
-        CONST.__setattr__('IS_CI_RUN', True)
-        test_str = ("+" + "=" * gen_report.COL_1_LEN +
-                    "+" + "=" * gen_report.COL_2_LEN +
-                    "+" + "=" * gen_report.COL_3_LEN +
-                    "+" + "=" * gen_report.COL_4_LEN +
-                    "+" + "=" * gen_report.COL_5_LEN)
-        test_str += '+\n'
-        self.assertEqual(gen_report.print_separator(), test_str)
-
-    def test_print_separator_without_ci_run(self):
-        CONST.__setattr__('IS_CI_RUN', False)
-        test_str = ("+" + "=" * gen_report.COL_1_LEN +
-                    "+" + "=" * gen_report.COL_2_LEN +
-                    "+" + "=" * gen_report.COL_3_LEN +
-                    "+" + "=" * gen_report.COL_4_LEN)
-        test_str += "+\n"
-        self.assertEqual(gen_report.print_separator(), test_str)
-
-    @mock.patch('functest.ci.generate_report.logger.info')
-    def test_main_with_ci_run(self, mock_method):
-        CONST.__setattr__('IS_CI_RUN', True)
-        gen_report.main()
-        mock_method.assert_called_once_with(test_utils.SubstrMatch('URL'))
-
-    @mock.patch('functest.ci.generate_report.logger.info')
-    def test_main_with_ci_loop(self, mock_method):
-        CONST.__setattr__('CI_LOOP', 'daily')
-        gen_report.main()
-        mock_method.assert_called_once_with(test_utils.SubstrMatch('CI LOOP'))
-
-    @mock.patch('functest.ci.generate_report.logger.info')
-    def test_main_with_scenario(self, mock_method):
-        CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario')
-        gen_report.main()
-        mock_method.assert_called_once_with(test_utils.SubstrMatch('SCENARIO'))
-
-    @mock.patch('functest.ci.generate_report.logger.info')
-    def test_main_with_build_tag(self, mock_method):
-        CONST.__setattr__('BUILD_TAG', 'test_build_tag')
-        gen_report.main()
-        mock_method.assert_called_once_with(test_utils.
-                                            SubstrMatch('BUILD TAG'))
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/ci/test_run_tests.py b/functest/tests/unit/ci/test_run_tests.py
index ef08282a..d0052392 100644
--- a/functest/tests/unit/ci/test_run_tests.py
+++ b/functest/tests/unit/ci/test_run_tests.py
@@ -70,17 +70,6 @@ class RunTestsTesting(unittest.TestCase):
         run_tests.cleanup()
         self.assertTrue(mock_os_clean.called)
 
-    def test_update_test_info(self):
-        run_tests.GlobalVariables.EXECUTED_TEST_CASES = [self.test]
-        run_tests.update_test_info('test_name',
-                                   'test_result',
-                                   'test_duration')
-        exp = self.test
-        exp.update({"result": 'test_result',
-                    "duration": 'test_duration'})
-        self.assertEqual(run_tests.GlobalVariables.EXECUTED_TEST_CASES,
-                         [exp])
-
     def test_get_run_dict_if_defined_default(self):
         mock_obj = mock.Mock()
         with mock.patch('functest.ci.run_tests.'
@@ -148,10 +137,8 @@ class RunTestsTesting(unittest.TestCase):
             mock.patch('functest.ci.run_tests.source_rc_file'), \
             mock.patch('functest.ci.run_tests.generate_os_snapshot'), \
             mock.patch('functest.ci.run_tests.cleanup'), \
-            mock.patch('functest.ci.run_tests.update_test_info'), \
             mock.patch('functest.ci.run_tests.get_run_dict',
                        return_value=test_run_dict), \
-            mock.patch('functest.ci.run_tests.generate_report.main'), \
                 self.assertRaises(run_tests.BlockingTestFailed) as context:
             run_tests.GlobalVariables.CLEAN_FLAG = True
             run_tests.run_test(mock_test, 'tier_name')
@@ -176,21 +163,17 @@ class RunTestsTesting(unittest.TestCase):
 
     @mock.patch('functest.ci.run_tests.logger.info')
     def test_run_all_default(self, mock_logger_info):
-        with mock.patch('functest.ci.run_tests.run_tier') as mock_method, \
-            mock.patch('functest.ci.run_tests.generate_report.init'), \
-                mock.patch('functest.ci.run_tests.generate_report.main'):
+        with mock.patch('functest.ci.run_tests.run_tier') as mock_method:
             CONST.__setattr__('CI_LOOP', 'test_ci_loop')
             run_tests.run_all(self.tiers)
             mock_method.assert_any_call(self.tier)
             self.assertTrue(mock_logger_info.called)
 
     @mock.patch('functest.ci.run_tests.logger.info')
-    def test_run_all__missing_tier(self, mock_logger_info):
-        with mock.patch('functest.ci.run_tests.generate_report.init'), \
-                mock.patch('functest.ci.run_tests.generate_report.main'):
-            CONST.__setattr__('CI_LOOP', 'loop_re_not_available')
-            run_tests.run_all(self.tiers)
-            self.assertTrue(mock_logger_info.called)
+    def test_run_all_missing_tier(self, mock_logger_info):
+        CONST.__setattr__('CI_LOOP', 'loop_re_not_available')
+        run_tests.run_all(self.tiers)
+        self.assertTrue(mock_logger_info.called)
 
     def test_main_failed(self):
         kwargs = {'test': 'test_name', 'noclean': True, 'report': True}
@@ -221,7 +204,6 @@ class RunTestsTesting(unittest.TestCase):
         with mock.patch('functest.ci.run_tests.tb.TierBuilder',
                         return_value=mock_obj), \
             mock.patch('functest.ci.run_tests.source_rc_file'), \
-            mock.patch('functest.ci.run_tests.generate_report.init'), \
                 mock.patch('functest.ci.run_tests.run_tier') as m:
             self.assertEqual(run_tests.main(**kwargs),
                              run_tests.Result.EX_OK)
@@ -234,7 +216,6 @@ class RunTestsTesting(unittest.TestCase):
         with mock.patch('functest.ci.run_tests.tb.TierBuilder',
                         return_value=mock_obj), \
             mock.patch('functest.ci.run_tests.source_rc_file'), \
-            mock.patch('functest.ci.run_tests.generate_report.init'), \
                 mock.patch('functest.ci.run_tests.run_test') as m:
             self.assertEqual(run_tests.main(**kwargs),
                              run_tests.Result.EX_OK)
@@ -248,7 +229,6 @@ class RunTestsTesting(unittest.TestCase):
         with mock.patch('functest.ci.run_tests.tb.TierBuilder',
                         return_value=mock_obj), \
             mock.patch('functest.ci.run_tests.source_rc_file'), \
-            mock.patch('functest.ci.run_tests.generate_report.init'), \
                 mock.patch('functest.ci.run_tests.run_all') as m:
             self.assertEqual(run_tests.main(**kwargs),
                              run_tests.Result.EX_OK)
@@ -262,7 +242,6 @@ class RunTestsTesting(unittest.TestCase):
         with mock.patch('functest.ci.run_tests.tb.TierBuilder',
                         return_value=mock_obj), \
             mock.patch('functest.ci.run_tests.source_rc_file'), \
-            mock.patch('functest.ci.run_tests.generate_report.init'), \
                 mock.patch('functest.ci.run_tests.logger.debug') as m:
             self.assertEqual(run_tests.main(**kwargs),
                              run_tests.Result.EX_ERROR)
diff --git a/functest/tests/unit/core/test_testcase.py b/functest/tests/unit/core/test_testcase.py
index 08a717a2..72229671 100644
--- a/functest/tests/unit/core/test_testcase.py
+++ b/functest/tests/unit/core/test_testcase.py
@@ -20,7 +20,6 @@ __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>"
 
 
 class TestCaseTesting(unittest.TestCase):
-
     """The class testing TestCase."""
     # pylint: disable=missing-docstring,too-many-public-methods