Merge "Replace CONST.* by getattribute/setattr"

3 files changed, 62 insertions, 54 deletions

diff --git a/functest/tests/unit/ci/test_generate_report.py b/functest/tests/unit/ci/test_generate_report.py
index 2225586f..13361c1d 100644
--- a/functest/tests/unit/ci/test_generate_report.py
+++ b/functest/tests/unit/ci/test_generate_report.py
@@ -29,7 +29,7 @@ class GenerateReportTesting(unittest.TestCase):
                 side_effect=urllib2.URLError('no host given'))
     def test_get_results_from_db_fail(self, mock_method):
         url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(),
-                                           CONST.BUILD_TAG)
+                                           CONST.__getattribute__('BUILD_TAG'))
         self.assertIsNone(gen_report.get_results_from_db())
         mock_method.assert_called_once_with(url)
 
@@ -37,7 +37,7 @@ class GenerateReportTesting(unittest.TestCase):
                 return_value={'results': []})
     def test_get_results_from_db_success(self, mock_method):
         url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(),
-                                           CONST.BUILD_TAG)
+                                           CONST.__getattribute__('BUILD_TAG'))
         self.assertEqual(gen_report.get_results_from_db(), None)
         mock_method.assert_called_once_with(url)
 
@@ -45,7 +45,7 @@ class GenerateReportTesting(unittest.TestCase):
         self.assertIsInstance(gen_report.get_data({'result': ''}, ''), dict)
 
     def test_print_line_with_ci_run(self):
-        CONST.IS_CI_RUN = True
+        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),
@@ -56,7 +56,7 @@ class GenerateReportTesting(unittest.TestCase):
         self.assertEqual(gen_report.print_line(w1), test_str)
 
     def test_print_line_without_ci_run(self):
-        CONST.IS_CI_RUN = False
+        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),
@@ -66,7 +66,7 @@ class GenerateReportTesting(unittest.TestCase):
         self.assertEqual(gen_report.print_line(w1), test_str)
 
     def test_print_line_no_column_with_ci_run(self):
-        CONST.IS_CI_RUN = True
+        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
@@ -74,14 +74,14 @@ class GenerateReportTesting(unittest.TestCase):
         self.assertEqual(gen_report.print_line_no_columns('test'), test_str)
 
     def test_print_line_no_column_without_ci_run(self):
-        CONST.IS_CI_RUN = False
+        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.IS_CI_RUN = True
+        CONST.__setattr__('IS_CI_RUN', True)
         test_str = ("+" + "=" * gen_report.COL_1_LEN +
                     "+" + "=" * gen_report.COL_2_LEN +
                     "+" + "=" * gen_report.COL_3_LEN +
@@ -91,7 +91,7 @@ class GenerateReportTesting(unittest.TestCase):
         self.assertEqual(gen_report.print_separator(), test_str)
 
     def test_print_separator_without_ci_run(self):
-        CONST.IS_CI_RUN = False
+        CONST.__setattr__('IS_CI_RUN', False)
         test_str = ("+" + "=" * gen_report.COL_1_LEN +
                     "+" + "=" * gen_report.COL_2_LEN +
                     "+" + "=" * gen_report.COL_3_LEN +
@@ -101,25 +101,25 @@ class GenerateReportTesting(unittest.TestCase):
 
     @mock.patch('functest.ci.generate_report.logger.info')
     def test_main_with_ci_run(self, mock_method):
-        CONST.IS_CI_RUN = True
+        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.CI_LOOP = 'daily'
+        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.DEPLOY_SCENARIO = 'test_scenario'
+        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.BUILD_TAG = 'test_build_tag'
+        CONST.__setattr__('BUILD_TAG', 'test_build_tag')
         gen_report.main()
         mock_method.assert_called_once_with(test_utils.
                                             SubstrMatch('BUILD TAG'))
diff --git a/functest/tests/unit/ci/test_prepare_env.py b/functest/tests/unit/ci/test_prepare_env.py
index 714dd13c..39a0825c 100644
--- a/functest/tests/unit/ci/test_prepare_env.py
+++ b/functest/tests/unit/ci/test_prepare_env.py
@@ -33,7 +33,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_missing_inst_type(self, mock_logger_warn,
                                                    mock_logger_info):
-        CONST.INSTALLER_TYPE = None
+        CONST.__setattr__('INSTALLER_TYPE', None)
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -44,7 +44,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_missing_inst_ip(self, mock_logger_warn,
                                                  mock_logger_info):
-        CONST.INSTALLER_IP = None
+        CONST.__setattr__('INSTALLER_IP', None)
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -61,7 +61,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_with_inst_ip(self, mock_logger_warn,
                                               mock_logger_info):
-        CONST.INSTALLER_IP = mock.Mock()
+        CONST.__setattr__('INSTALLER_IP', mock.Mock())
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -72,7 +72,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_missing_scenario(self, mock_logger_warn,
                                                   mock_logger_info):
-        CONST.DEPLOY_SCENARIO = None
+        CONST.__setattr__('DEPLOY_SCENARIO', None)
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -84,7 +84,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_with_scenario(self, mock_logger_warn,
                                                mock_logger_info):
-        CONST.DEPLOY_SCENARIO = 'test_scenario'
+        CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario')
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -95,7 +95,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_with_ci_debug(self, mock_logger_warn,
                                                mock_logger_info):
-        CONST.CI_DEBUG = mock.Mock()
+        CONST.__setattr__('CI_DEBUG', mock.Mock())
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -106,7 +106,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_with_node(self, mock_logger_warn,
                                            mock_logger_info):
-        CONST.NODE_NAME = mock.Mock()
+        CONST.__setattr__('NODE_NAME', mock.Mock())
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -117,7 +117,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_with_build_tag(self, mock_logger_warn,
                                                 mock_logger_info):
-        CONST.BUILD_TAG = mock.Mock()
+        CONST.__setattr__('BUILD_TAG', mock.Mock())
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -129,7 +129,7 @@ class PrepareEnvTesting(unittest.TestCase):
     @mock.patch('functest.ci.prepare_env.logger.warning')
     def test_check_env_variables_with_is_ci_run(self, mock_logger_warn,
                                                 mock_logger_info):
-        CONST.IS_CI_RUN = mock.Mock()
+        CONST.__setattr__('IS_CI_RUN', mock.Mock())
         prepare_env.check_env_variables()
         mock_logger_info.assert_any_call("Checking environment variables"
                                          "...")
@@ -140,11 +140,11 @@ class PrepareEnvTesting(unittest.TestCase):
     def test_get_deployment_handler_missing_const_vars(self):
         with mock.patch('functest.ci.prepare_env.'
                         'factory.Factory.get_handler') as m:
-            CONST.INSTALLER_IP = None
+            CONST.__setattr__('INSTALLER_IP', None)
             prepare_env.get_deployment_handler()
             self.assertFalse(m.called)
 
-            CONST.INSTALLER_TYPE = None
+            CONST.__setattr__('INSTALLER_TYPE', None)
             prepare_env.get_deployment_handler()
             self.assertFalse(m.called)
 
@@ -156,8 +156,8 @@ class PrepareEnvTesting(unittest.TestCase):
             mock.patch('functest.ci.prepare_env.'
                        'ft_utils.get_parameter_from_yaml',
                        side_effect=ValueError):
-            CONST.INSTALLER_IP = 'test_ip'
-            CONST.INSTALLER_TYPE = 'test_inst_type'
+            CONST.__setattr__('INSTALLER_IP', 'test_ip')
+            CONST.__setattr__('INSTALLER_TYPE', 'test_inst_type')
             opnfv_constants.INSTALLERS = ['test_inst_type']
             prepare_env.get_deployment_handler()
             msg = ('Printing deployment info is not supported for '
@@ -172,8 +172,8 @@ class PrepareEnvTesting(unittest.TestCase):
                         side_effect=Exception), \
             mock.patch('functest.ci.prepare_env.'
                        'ft_utils.get_parameter_from_yaml'):
-            CONST.INSTALLER_IP = 'test_ip'
-            CONST.INSTALLER_TYPE = 'test_inst_type'
+            CONST.__setattr__('INSTALLER_IP', 'test_ip')
+            CONST.__setattr__('INSTALLER_TYPE', 'test_inst_type')
             opnfv_constants.INSTALLERS = ['test_inst_type']
             prepare_env.get_deployment_handler()
             self.assertTrue(mock_debug.called)
@@ -188,12 +188,16 @@ class PrepareEnvTesting(unittest.TestCase):
                 as mock_method:
             prepare_env.create_directories()
             mock_logger_info.assert_any_call("Creating needed directories...")
-            mock_method.assert_any_call(CONST.dir_functest_conf)
-            mock_method.assert_any_call(CONST.dir_functest_data)
+            mock_method.assert_any_call(
+                CONST.__getattribute__('dir_functest_conf'))
+            mock_method.assert_any_call(
+                CONST.__getattribute__('dir_functest_data'))
             mock_logger_info.assert_any_call("    %s created." %
-                                             CONST.dir_functest_conf)
+                                             CONST.__getattribute__(
+                                                 'dir_functest_conf'))
             mock_logger_info.assert_any_call("    %s created." %
-                                             CONST.dir_functest_data)
+                                             CONST.__getattribute__(
+                                                 'dir_functest_data'))
 
     @mock.patch('functest.ci.prepare_env.logger.info')
     @mock.patch('functest.ci.prepare_env.logger.debug')
@@ -204,9 +208,11 @@ class PrepareEnvTesting(unittest.TestCase):
             prepare_env.create_directories()
             mock_logger_info.assert_any_call("Creating needed directories...")
             mock_logger_debug.assert_any_call("   %s already exists." %
-                                              CONST.dir_functest_conf)
+                                              CONST.__getattribute__(
+                                                  'dir_functest_conf'))
             mock_logger_debug.assert_any_call("   %s already exists." %
-                                              CONST.dir_functest_data)
+                                              CONST.__getattribute__(
+                                                  'dir_functest_data'))
 
     def _get_env_cred_dict(self, os_prefix=''):
         return {'OS_USERNAME': os_prefix + 'username',
@@ -230,24 +236,24 @@ class PrepareEnvTesting(unittest.TestCase):
                 mock.patch('functest.ci.prepare_env.os.path.getsize',
                            return_value=0), \
                 self.assertRaises(Exception):
-            CONST.openstack_creds = 'test_creds'
+            CONST.__setattr__('openstack_creds', 'test_creds')
             prepare_env.source_rc_file()
 
     def test_source_rc_missing_installer_ip(self):
         with mock.patch('functest.ci.prepare_env.os.path.isfile',
                         return_value=False), \
                 self.assertRaises(Exception):
-            CONST.INSTALLER_IP = None
-            CONST.openstack_creds = 'test_creds'
+            CONST.__setattr__('INSTALLER_IP', None)
+            CONST.__setattr__('openstack_creds', 'test_creds')
             prepare_env.source_rc_file()
 
     def test_source_rc_missing_installer_type(self):
         with mock.patch('functest.ci.prepare_env.os.path.isfile',
                         return_value=False), \
                 self.assertRaises(Exception):
-            CONST.INSTALLER_IP = 'test_ip'
-            CONST.openstack_creds = 'test_creds'
-            CONST.INSTALLER_TYPE = 'test_type'
+            CONST.__setattr__('INSTALLER_IP', 'test_ip')
+            CONST.__setattr__('openstack_creds', 'test_creds')
+            CONST.__setattr__('INSTALLER_TYPE', 'test_type')
             opnfv_constants.INSTALLERS = []
             prepare_env.source_rc_file()
 
@@ -259,9 +265,9 @@ class PrepareEnvTesting(unittest.TestCase):
                 mock.patch('functest.ci.prepare_env.subprocess.Popen') \
                 as mock_subproc_popen, \
                 self.assertRaises(Exception):
-            CONST.openstack_creds = 'test_creds'
-            CONST.INSTALLER_IP = None
-            CONST.INSTALLER_TYPE = 'test_type'
+            CONST.__setattr__('openstack_creds', 'test_creds')
+            CONST.__setattr__('INSTALLER_IP', None)
+            CONST.__setattr__('INSTALLER_TYPE', 'test_type')
             opnfv_constants.INSTALLERS = ['test_type']
 
             process_mock = mock.Mock()
@@ -281,7 +287,7 @@ class PrepareEnvTesting(unittest.TestCase):
                        return_value={'tkey1': 'tvalue1'}), \
             mock.patch('functest.ci.prepare_env.os.remove') as m, \
                 mock.patch('functest.ci.prepare_env.yaml.dump'):
-            CONST.DEPLOY_SCENARIO = 'test_scenario'
+            CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario')
             prepare_env.patch_file('test_file')
             self.assertTrue(m.called)
 
@@ -321,12 +327,12 @@ class PrepareEnvTesting(unittest.TestCase):
 
         cmd = "rally deployment destroy opnfv-rally"
         error_msg = "Deployment %s does not exist." % \
-                    CONST.rally_deployment_name
+                    CONST.__getattribute__('rally_deployment_name')
         mock_logger_info.assert_any_call("Creating Rally environment...")
         mock_exec.assert_any_call(cmd, error_msg=error_msg, verbose=False)
 
         cmd = "rally deployment create --file=rally_conf.json --name="
-        cmd += CONST.rally_deployment_name
+        cmd += CONST.__getattribute__('rally_deployment_name')
         error_msg = "Problem while creating Rally deployment"
         mock_exec_raise.assert_any_call(cmd, error_msg=error_msg)
 
@@ -352,7 +358,7 @@ class PrepareEnvTesting(unittest.TestCase):
                  'stdout.readline.return_value': '0'}
         mock_popen.configure_mock(**attrs)
 
-        CONST.tempest_deployment_name = 'test_dep_name'
+        CONST.__setattr__('tempest_deployment_name', 'test_dep_name')
         with mock.patch('functest.ci.prepare_env.'
                         'ft_utils.execute_command_raise',
                         side_effect=Exception), \
@@ -379,7 +385,7 @@ class PrepareEnvTesting(unittest.TestCase):
         with mock.patch('functest.ci.prepare_env.os.path.isfile',
                         return_value=False), \
                 self.assertRaises(Exception):
-                prepare_env.check_environment()
+            prepare_env.check_environment()
 
     @mock.patch('functest.ci.prepare_env.sys.exit')
     @mock.patch('functest.ci.prepare_env.logger.error')
@@ -431,7 +437,8 @@ class PrepareEnvTesting(unittest.TestCase):
             self.assertTrue(mock_install_rally.called)
             self.assertTrue(mock_install_temp.called)
             self.assertTrue(mock_create_flavor.called)
-            m.assert_called_once_with(CONST.env_active, "w")
+            m.assert_called_once_with(
+                CONST.__getattribute__('env_active'), "w")
             self.assertTrue(mock_check_env.called)
             self.assertTrue(mock_print_info.called)
 
diff --git a/functest/tests/unit/ci/test_run_tests.py b/functest/tests/unit/ci/test_run_tests.py
index 7d02b1af..ef08282a 100644
--- a/functest/tests/unit/ci/test_run_tests.py
+++ b/functest/tests/unit/ci/test_run_tests.py
@@ -62,13 +62,13 @@ class RunTestsTesting(unittest.TestCase):
 
     @mock.patch('functest.ci.run_tests.os_snapshot.main')
     def test_generate_os_snapshot(self, mock_os_snap):
-            run_tests.generate_os_snapshot()
-            self.assertTrue(mock_os_snap.called)
+        run_tests.generate_os_snapshot()
+        self.assertTrue(mock_os_snap.called)
 
     @mock.patch('functest.ci.run_tests.os_clean.main')
     def test_cleanup(self, mock_os_clean):
-            run_tests.cleanup()
-            self.assertTrue(mock_os_clean.called)
+        run_tests.cleanup()
+        self.assertTrue(mock_os_clean.called)
 
     def test_update_test_info(self):
         run_tests.GlobalVariables.EXECUTED_TEST_CASES = [self.test]
@@ -179,7 +179,7 @@ class RunTestsTesting(unittest.TestCase):
         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'):
-            CONST.CI_LOOP = 'test_ci_loop'
+            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)
@@ -188,7 +188,7 @@ class RunTestsTesting(unittest.TestCase):
     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.CI_LOOP = 'loop_re_not_available'
+            CONST.__setattr__('CI_LOOP', 'loop_re_not_available')
             run_tests.run_all(self.tiers)
             self.assertTrue(mock_logger_info.called)
 
@@ -268,5 +268,6 @@ class RunTestsTesting(unittest.TestCase):
                              run_tests.Result.EX_ERROR)
             self.assertTrue(m.called)
 
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)