Skip to content

Commit c28574a

Browse files
committed
fix(vm): lazy-import shlex/ResourceExistsError and fix Invoke mock target
1 parent 646a284 commit c28574a

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/azure-cli/azure/cli/command_modules/vm/custom.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import json
1616
import os
1717
import uuid
18-
import shlex
1918
from datetime import datetime, timedelta
2019

2120
import requests
@@ -25,7 +24,7 @@
2524

2625
from knack.log import get_logger
2726
from knack.util import CLIError
28-
from azure.core.exceptions import ResourceExistsError
27+
2928
from azure.cli.core.azclierror import (
3029
ResourceNotFoundError,
3130
ValidationError,
@@ -6602,6 +6601,8 @@ def _get_vm_and_rg(cmd, vm_name, rg=None):
66026601

66036602

66046603
def vm_cp(cmd, source, destination, storage_account=None, container_name='azvmcp'):
6604+
import shlex
6605+
from azure.core.exceptions import ResourceExistsError
66056606
from azure.cli.command_modules.storage.operations.blob import upload_blob, download_blob
66066607
from azure.cli.command_modules.storage.util import create_short_lived_blob_sas_v2
66076608
from azure.cli.command_modules.storage._client_factory import cf_sa, cf_sa_for_keys, cf_blob_service

src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_cp_unit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_vm_cp_upload_basic(self, mock_upload, mock_sas, mock_blob_factory, mock
7171
mock_container.get_blob_client.return_value = mock_blob
7272

7373
# Execute
74-
with mock.patch('azure.cli.command_modules.vm.custom.Invoke') as mock_invoke:
74+
with mock.patch('azure.cli.command_modules.vm.aaz.latest.vm.run_command.Invoke') as mock_invoke:
7575
mock_invoke.return_value.return_value = {'value': [{'message': 'success'}]}
7676
vm_cp(cmd, source="local.txt", destination="myrg:myvm:/tmp/remote.txt")
7777

@@ -123,7 +123,7 @@ def test_vm_cp_download_basic(self, mock_download, mock_blob_factory, mock_keys_
123123
mock_container.get_blob_client.return_value = mock_blob
124124

125125
# Execute
126-
with mock.patch('azure.cli.command_modules.vm.custom.Invoke') as mock_invoke:
126+
with mock.patch('azure.cli.command_modules.vm.aaz.latest.vm.run_command.Invoke') as mock_invoke:
127127
mock_invoke.return_value.return_value = {'value': [{'message': 'success'}]}
128128
vm_cp(cmd, source="myrg:myvm:/tmp/remote.txt", destination="local.txt")
129129

0 commit comments

Comments
 (0)