X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Ftests%2Funit%2Fcli%2Fcommands%2Ftest_cli_env.py;h=b4e9878718a8b71bc23a108bb6a0e102e341ab39;hb=0914c7e7011b7ba3ed9eeae7f6c3605afb711640;hp=4b6ea57a7366a38d57407f9beeda73a8faf6d073;hpb=40c99a7b178ec081bf7711bb82dcce70ea7c3324;p=functest.git

diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py
index 4b6ea57a7..b4e987871 100644
--- a/functest/tests/unit/cli/commands/test_cli_env.py
+++ b/functest/tests/unit/cli/commands/test_cli_env.py
@@ -8,7 +8,6 @@
 import logging
 import unittest
 
-from git.exc import NoSuchPathError
 import mock
 
 from functest.cli.commands import cli_env
@@ -18,8 +17,6 @@ from functest.tests.unit import test_utils
 
 class CliEnvTesting(unittest.TestCase):
 
-    logging.disable(logging.CRITICAL)
-
     def setUp(self):
         self.cli_environ = cli_env.CliEnv()
 
@@ -28,7 +25,7 @@ class CliEnvTesting(unittest.TestCase):
     @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
     def test_prepare_default(self, mock_ft_utils, mock_os):
         cmd = ("python %s/functest/ci/prepare_env.py start" %
-               CONST.dir_repo_functest)
+               CONST.__getattribute__('dir_repo_functest'))
         self.cli_environ.prepare()
         mock_ft_utils.assert_called_with(cmd)
 
@@ -40,29 +37,30 @@ class CliEnvTesting(unittest.TestCase):
                 mock.patch('functest.cli.commands.cli_testcase.os.remove') \
                 as mock_os_remove:
             cmd = ("python %s/functest/ci/prepare_env.py start" %
-                   CONST.dir_repo_functest)
+                   CONST.__getattribute__('dir_repo_functest'))
             self.cli_environ.prepare()
-            mock_os_remove.assert_called_once_with(CONST.env_active)
+            mock_os_remove.assert_called_once_with(
+                CONST.__getattribute__('env_active'))
             mock_ft_utils.assert_called_with(cmd)
 
     def _test_show_missing_env_var(self, var, *args):
         if var == 'INSTALLER_TYPE':
-            CONST.INSTALLER_TYPE = None
+            CONST.__setattr__('INSTALLER_TYPE', None)
             reg_string = "|  INSTALLER: Unknown, \S+\s*|"
         elif var == 'INSTALLER_IP':
-            CONST.INSTALLER_IP = None
+            CONST.__setattr__('INSTALLER_IP', None)
             reg_string = "|  INSTALLER: \S+, Unknown\s*|"
         elif var == 'SCENARIO':
-            CONST.DEPLOY_SCENARIO = None
+            CONST.__setattr__('DEPLOY_SCENARIO', None)
             reg_string = "|   SCENARIO: Unknown\s*|"
         elif var == 'NODE':
-            CONST.NODE_NAME = None
+            CONST.__setattr__('NODE_NAME', None)
             reg_string = "|        POD: Unknown\s*|"
         elif var == 'BUILD_TAG':
-            CONST.BUILD_TAG = None
+            CONST.__setattr__('BUILD_TAG', None)
             reg_string = "|  BUILD TAG: None|"
         elif var == 'DEBUG':
-            CONST.CI_DEBUG = None
+            CONST.__setattr__('CI_DEBUG', None)
             reg_string = "| DEBUG FLAG: false\s*|"
         elif var == 'STATUS':
             reg_string = "|     STATUS: not ready\s*|"
@@ -73,42 +71,29 @@ class CliEnvTesting(unittest.TestCase):
             mock_click_echo.assert_called_with(test_utils.
                                                RegexMatch(reg_string))
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     def test_show_missing_ci_installer_type(self, *args):
         self._test_show_missing_env_var('INSTALLER_TYPE', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     def test_show_missing_ci_installer_ip(self, *args):
         self._test_show_missing_env_var('INSTALLER_IP', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     def test_show_missing_ci_scenario(self, *args):
         self._test_show_missing_env_var('SCENARIO', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     def test_show_missing_ci_node(self, *args):
         self._test_show_missing_env_var('NODE', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     def test_show_missing_ci_build_tag(self, *args):
         self._test_show_missing_env_var('BUILD_TAG', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     def test_show_missing_ci_debug(self, *args):
         self._test_show_missing_env_var('DEBUG', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.git.Repo')
     @mock.patch('functest.cli.commands.cli_env.os.path.isfile',
                 return_value=False)
     def test_show_missing_environment(self, *args):
         self._test_show_missing_env_var('STATUS', *args)
 
-    @mock.patch('functest.cli.commands.cli_env.os.path.exists',
-                return_value=False)
-    def test_show_missing_git_repo_dir(self, *args):
-        CONST.dir_repo_functest = None
-        self.assertRaises(NoSuchPathError, lambda: self.cli_environ.show())
-
     @mock.patch('functest.cli.commands.cli_env.click.echo')
     @mock.patch('functest.cli.commands.cli_env.os.path.isfile',
                 return_value=True)
@@ -127,4 +112,5 @@ class CliEnvTesting(unittest.TestCase):
 
 
 if __name__ == "__main__":
+    logging.disable(logging.CRITICAL)
     unittest.main(verbosity=2)