Merge pull request #6003 from mxie91/auto-three-v2v-cases-about-virsh…

…-connection-bugs Auto three v2v cases about virsh dump bugs
autotest · Nov 20, 2024 · 54364e8 · 54364e8
2 parents da250b2 + 090aef4
commit 54364e8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/v2v/tests/cfg/function_test_esx.cfg b/v2v/tests/cfg/function_test_esx.cfg
@@ -407,11 +407,10 @@
             main_vm = VM_NAME_DEVICE_PASSTHRU_V2V_EXAMPLE
         - empty_cdrom:
             only esx_80
-            main_vm = VM_NAME_EMPTY_CDROM_V2V_EXAMPLE
-            checkpoint = empty_cdrom
             boottype = 3
+            main_vm = VM_NAME_EMPTY_IDE_SATA_CDROM_V2V_EXAMPLE
             skip_vm_check = yes
-            skip_reason = "No vm is created in this case"
+            skip_reason = 'bug RHEL-38633 is not fixed'
         - option_root:
             main_vm = VM_NAME_MULTIPLE_LINUX_V2V_EXAMPLE
             checkpoint = root

diff --git a/v2v/tests/cfg/specific_kvm.cfg b/v2v/tests/cfg/specific_kvm.cfg
@@ -296,6 +296,19 @@
             main_vm = 'VM_NAME_80_UBUNTU_PARTIAL_EFI_V2V_EXAMPLE'
             skip_vm_check = yes
             skip_reason = "Special configuration. No console available"
+        - serial_port:
+            only esx_80
+            variants:
+                - chars_telnet:
+                    boottype = 2
+                    main_vm = VM_NAME_SERVIAL_PORT_CHARACTERS_TELNET_URL_V2V_EXAMPLE
+                - empty_info:
+                    boottype = 2
+                    main_vm = VM_NAME_SERVIAL_PORT_EMPTY_V2V_EXAMPLE
+        - vmx_char:
+            only esx_80
+            boottype = 2
+            main_vm = VM_NAME_VMX_CONTAINS_CHAR_V2V_EXAMPLE
     variants:
         - positive_test:
             status_error = 'no'

diff --git a/v2v/tests/src/function_test_esx.py b/v2v/tests/src/function_test_esx.py
@@ -949,8 +949,6 @@ def vm_check(status_error):
             params['msg_content_yes'] += '<rasd:num_of_sockets>' + res_cpu_topology.get('sockets') + '%'
             params['msg_content_yes'] += '<rasd:cpu_per_socket>' + res_cpu_topology.get('cores') + '%'
             params['msg_content_yes'] += '<rasd:threads_per_cpu>' + res_cpu_topology.get('threads')
-        if 'empty_cdrom' in checkpoint:
-            v2v_result = raw_dumpxml
         else:
             if 'exist_uuid' in checkpoint:
                 auto_clean = False