Set env

Author: bebound

src/azure-cli-core/azure/cli/core/mock.py

@@ -10,7 +10,6 @@ class DummyCli(AzCli):
     """A dummy CLI instance can be used to facilitate automation"""
     def __init__(self, commands_loader_cls=None, random_config_dir=False, **kwargs):
         import os
-        from unittest.mock import patch
 
         from azure.cli.core import MainCommandsLoader
         from azure.cli.core.commands import AzCliCommandInvoker
@@ -27,6 +26,9 @@ def __init__(self, commands_loader_cls=None, random_config_dir=False, **kwargs):
 
         if random_config_dir:
             config_dir = os.path.join(GLOBAL_CONFIG_DIR, 'dummy_cli_config_dir', random_string())
+            # Knack prioritizes the AZURE_CONFIG_DIR env over the config_dir param, and other function may call
+            # get_config_dir directly. We need to set the env to make sure the config_dir is used.
+            os.environ['AZURE_CONFIG_DIR'] = config_dir
 
             # In recording mode, copy login credentials from global config dir to the dummy config dir
             if os.getenv(ENV_VAR_TEST_LIVE, '').lower() == 'true':
@@ -42,20 +44,16 @@ def __init__(self, commands_loader_cls=None, random_config_dir=False, **kwargs):
         else:
             config_dir = GLOBAL_CONFIG_DIR
 
-        # Knack prioritizes the AZURE_CONFIG_DIR env over the config_dir param, we need to set the env var temporarily
-        # to make sure it uses the config_dir param
-        patch_env = {'AZURE_CONFIG_DIR': config_dir} if random_config_dir else {}
-        with patch.dict('os.environ', patch_env):
-            super(DummyCli, self).__init__(
-                cli_name='az',
-                config_dir=config_dir,
-                config_env_var_prefix=ENV_VAR_PREFIX,
-                commands_loader_cls=commands_loader_cls or MainCommandsLoader,
-                parser_cls=AzCliCommandParser,
-                logging_cls=AzCliLogging,
-                output_cls=AzOutputProducer,
-                help_cls=AzCliHelp,
-                invocation_cls=AzCliCommandInvoker)
+        super(DummyCli, self).__init__(
+            cli_name='az',
+            config_dir=config_dir,
+            config_env_var_prefix=ENV_VAR_PREFIX,
+            commands_loader_cls=commands_loader_cls or MainCommandsLoader,
+            parser_cls=AzCliCommandParser,
+            logging_cls=AzCliLogging,
+            output_cls=AzOutputProducer,
+            help_cls=AzCliHelp,
+            invocation_cls=AzCliCommandInvoker)
 
         self.data['headers'] = {}  # the x-ms-client-request-id is generated before a command is to execute
         self.data['command'] = 'unknown'