From 22fa6551c51163fd63c0d641397530ca44e3188d Mon Sep 17 00:00:00 2001 From: Yan Zhu <105691024+yanzhudd@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:22:56 +0800 Subject: [PATCH] {Compute} Fix tests of VM image (#30417) --- .../vm/tests/hybrid_2018_03_01/test_vm_image.py | 5 ++++- .../vm/tests/hybrid_2019_03_01/test_vm_image.py | 5 ++++- .../vm/tests/hybrid_2020_09_01/test_vm_image.py | 5 ++++- .../cli/command_modules/vm/tests/latest/test_vm_image.py | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2018_03_01/test_vm_image.py b/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2018_03_01/test_vm_image.py index d7618b033b9..b7c580105ec 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2018_03_01/test_vm_image.py +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2018_03_01/test_vm_image.py @@ -9,6 +9,7 @@ from azure.cli.core.cloud import CloudEndpointNotSetException from azure.cli.core.mock import DummyCli +from azure.cli.testsdk import LiveScenarioTest from knack.util import CLIError @@ -26,7 +27,7 @@ def _get_test_cmd(): return cmd -class TestVMImage(unittest.TestCase): +class VMImageLiveScenarioTest(LiveScenarioTest): def test_read_images_from_alias_doc(self): from azure.cli.command_modules.vm.azure_stack.custom import list_vm_images @@ -48,6 +49,8 @@ def test_read_images_from_alias_doc(self): self.assertEqual(parts[2], ubuntu_image['sku']) self.assertEqual(parts[3], ubuntu_image['version']) + +class TestVMImage(unittest.TestCase): @mock.patch('azure.cli.core.cloud.get_active_cloud', autospec=True) def test_when_alias_doc_is_missing(self, mock_get_active_cloud): from azure.cli.command_modules.vm.azure_stack._actions import load_images_from_aliases_doc diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2019_03_01/test_vm_image.py b/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2019_03_01/test_vm_image.py index d7618b033b9..b7c580105ec 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2019_03_01/test_vm_image.py +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2019_03_01/test_vm_image.py @@ -9,6 +9,7 @@ from azure.cli.core.cloud import CloudEndpointNotSetException from azure.cli.core.mock import DummyCli +from azure.cli.testsdk import LiveScenarioTest from knack.util import CLIError @@ -26,7 +27,7 @@ def _get_test_cmd(): return cmd -class TestVMImage(unittest.TestCase): +class VMImageLiveScenarioTest(LiveScenarioTest): def test_read_images_from_alias_doc(self): from azure.cli.command_modules.vm.azure_stack.custom import list_vm_images @@ -48,6 +49,8 @@ def test_read_images_from_alias_doc(self): self.assertEqual(parts[2], ubuntu_image['sku']) self.assertEqual(parts[3], ubuntu_image['version']) + +class TestVMImage(unittest.TestCase): @mock.patch('azure.cli.core.cloud.get_active_cloud', autospec=True) def test_when_alias_doc_is_missing(self, mock_get_active_cloud): from azure.cli.command_modules.vm.azure_stack._actions import load_images_from_aliases_doc diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2020_09_01/test_vm_image.py b/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2020_09_01/test_vm_image.py index d7618b033b9..b7c580105ec 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2020_09_01/test_vm_image.py +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/hybrid_2020_09_01/test_vm_image.py @@ -9,6 +9,7 @@ from azure.cli.core.cloud import CloudEndpointNotSetException from azure.cli.core.mock import DummyCli +from azure.cli.testsdk import LiveScenarioTest from knack.util import CLIError @@ -26,7 +27,7 @@ def _get_test_cmd(): return cmd -class TestVMImage(unittest.TestCase): +class VMImageLiveScenarioTest(LiveScenarioTest): def test_read_images_from_alias_doc(self): from azure.cli.command_modules.vm.azure_stack.custom import list_vm_images @@ -48,6 +49,8 @@ def test_read_images_from_alias_doc(self): self.assertEqual(parts[2], ubuntu_image['sku']) self.assertEqual(parts[3], ubuntu_image['version']) + +class TestVMImage(unittest.TestCase): @mock.patch('azure.cli.core.cloud.get_active_cloud', autospec=True) def test_when_alias_doc_is_missing(self, mock_get_active_cloud): from azure.cli.command_modules.vm.azure_stack._actions import load_images_from_aliases_doc diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_image.py b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_image.py index 078ebfc1227..200c49b78f7 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_image.py +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_image.py @@ -9,6 +9,7 @@ from azure.cli.core.cloud import CloudEndpointNotSetException from azure.cli.core.mock import DummyCli +from azure.cli.testsdk import LiveScenarioTest from knack.util import CLIError @@ -26,7 +27,7 @@ def _get_test_cmd(): return cmd -class TestVMImage(unittest.TestCase): +class VMImageLiveScenarioTest(LiveScenarioTest): def test_read_images_from_alias_doc(self): from azure.cli.command_modules.vm.custom import list_vm_images @@ -48,6 +49,8 @@ def test_read_images_from_alias_doc(self): self.assertEqual(parts[2], ubuntu_image['sku']) self.assertEqual(parts[3], ubuntu_image['version']) + +class TestVMImage(unittest.TestCase): @mock.patch('azure.cli.core.cloud.get_active_cloud', autospec=True) def test_when_alias_doc_is_missing(self, mock_get_active_cloud): from azure.cli.command_modules.vm._actions import load_images_from_aliases_doc