diff --git a/qemu/cfg/tests-spice.cfg b/qemu/cfg/tests-spice.cfg index af94b7c27..88030eefb 100644 --- a/qemu/cfg/tests-spice.cfg +++ b/qemu/cfg/tests-spice.cfg @@ -1,10 +1,52 @@ include tests-shared.cfg image_size = 20G +spice_seamless_migration = on +drive_cache=none + +# Use non-root user for Spice tests rather than root +# since User gnome session is needed. +username=test +password=123456 + +# Use static MAC addresses for spice tests to have +# the same IP in all test. +nics = nic1 nic2 +nics_vm1 = nic1 +nics_vm2 = nic2 +mac_nic1 = 9a:96:97:98:99:9a +mac_nic2 = 9a:9b:9c:9d:9e:9f + +qemu_binary = /usr/libexec/qemu-kvm +qemu_img_binary = /usr/bin/qemu-img +qemu_io_binary = /usr/bin/qemu-io +rv_binary = /usr/bin/remote-viewer + +# Only qcow2 file format +only qcow2 +# Only e1000 for nw card +only e1000 +# Only ide hard drives +only ide +# qemu-kvm will start with a single processor +only up +# Disable 9p export by default +only no_9p_export +# No PCI assignable devices +only no_pci_assignable +# No large memory pages +only smallpages variants: - qxl: + - os: + variants: + - RHEL: + only Linux.RHEL.6.devel.x86_64 + - Windows: + only Win7.64.sp1 + variants: - vnc: display = vnc @@ -141,225 +183,83 @@ variants: variants: - qemu_kvm_rhel6devel_install_client: - # Use this only when you need to create rhel6devel image qcow - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - image_name = images/rhel6devel-64_client - only qcow2 - only rtl8139 - only ide - only smp2 - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + image_name += "_client" + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor only unattended_install.cdrom.extra_cdrom_ks # Runs qemu-kvm Windows guest install - @qemu_kvm_windows_install_guest: - # We want qemu-kvm for this run - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - # Only qcow2 file format - only qcow2 - # Only rtl8139 for nw card (default on qemu-kvm) - only rtl8139 - # Only ide hard drives - only ide - # qemu-kvm will start only with -smp 2 (2 processors) - only smp2 - # Disable 9p export by default - only no_9p_export - # No PCI assignable devices - only no_pci_assignable - # No large memory pages - only smallpages - # Operating system choice - only Win7.64.sp1 + only os.Windows # Subtest choice. You can modify that line to add more subtests only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor only unattended_install.cdrom - - qemu_kvm_rhel6devel_install_guest: - # Use this only when you need to create rhel6devel image qcow - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - only qcow2 - only rtl8139 - only ide - only smp2 - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor only unattended_install.cdrom.extra_cdrom_ks - @remote_viewer_rhel6develssl: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.ssl.key_password.password.dcp_off.1monitor - only rv_connect.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @remote_viewer_rhel6devel_quick: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL + only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 + + - @remote_viewer_rhel6devel_password: + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor - only rv_connect.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @remote_viewer_win_guest_quick: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Win7.64.sp1 + only os.Windows only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor #rv_connect_win is specifically a test meant for a windows guest and a rhel client, rv_connect cannot be used. - only rv_connect_win.RHEL.6.devel.x86_64, shutdown + only rv.rw.rv_connect.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @spice_negative_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL only negative_create - @rv_disconnect_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor - only rv_connect.RHEL.6.devel.x86_64, rv_disconnect.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_disconnect.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @rv_fullscreen_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - spice_port = 3000 - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + spice_port=3000 + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor - only fullscreen_setup.RHEL.6.devel.x86_64, rv_connect.RHEL.6.devel.x86_64, rv_fullscreen.RHEL.6.devel.x86_64, shutdown + only rv.rr.fullscreen_setup.RHEL.6.devel.x86_64, rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_fullscreen.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @rv_logging_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor - only rv_connect.RHEL.6.devel.x86_64, rv_logging.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_logging.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @rv_copyandpaste_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor - only Linux.RHEL.6.devel.x86_64 - only rv_connect.RHEL.6.devel.x86_64, rv_copyandpaste.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_copyandpaste.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @rv_copyandpaste_dcp_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_on.1monitor - only Linux.RHEL.6.devel.x86_64 - only rv_connect.RHEL.6.devel.x86_64, rv_copyandpaste.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_copyandpaste.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 - @rv_input_rhel6devel: - qemu_binary = /usr/libexec/qemu-kvm - qemu_img_binary = /usr/bin/qemu-img - qemu_io_binary = /usr/bin/qemu-io - rv_binary = /usr/bin/remote-viewer - only qcow2 - only e1000 - only ide - only up - only no_9p_export - only no_pci_assignable - only smallpages - only Linux.RHEL.6.devel.x86_64 + only os.RHEL only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor - only rv_connect.RHEL.6.devel.x86_64, rv_input.RHEL.6.devel.x86_64, shutdown + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_input.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 + + - @rv_vmshutdown_rhel6devel: + only os.RHEL + only spice.default_ipv.default_pc.default_sv.default_zlib_wc.default_jpeg_wc.default_ic.no_ssl.no_password.dcp_off.1monitor + only rv.rr.rv_connect.RHEL.6.devel.x86_64, rv.rr.rv_vmshutdown.RHEL.6.devel.x86_64, rv.rr.client_guest_shutdown.RHEL.6.devel.x86_64 variants: #The following are all the individual tests for spice @@ -387,6 +287,24 @@ variants: only spice_negative_rhel6devel - remote_viewer_test: only remote_viewer_rhel6devel_quick + - rv_connect_passwd: + only remote_viewer_rhel6devel_password + - rv_connect_wrong_passwd: + test_type = negative + spice_password_send = incorrectpass + only remote_viewer_rhel6devel_password + - rv_qemu_password: + qemu_password = qemupassword + only remote_viewer_rhel6devel_quick + - rv_qemu_password_overwrite: + qemu_password = qemupassword + only remote_viewer_rhel6devel_password + - guestvmshutdown_cmd: + shutdownfrom = cmd + only rv_vmshutdown_rhel6devel + - guestvmshutdown_qemu: + shutdownfrom = qemu_monitor + only rv_vmshutdown_rhel6devel - remote_viewer_fullscreen_test: full_screen = yes only rv_fullscreen_rhel6devel @@ -517,15 +435,19 @@ variants: text_to_test=262144 only rv_copyandpaste_rhel6devel - keyboard_input_leds_and_esc_keys: + full_screen = yes config_test = "leds_and_esc_keys" only rv_input_rhel6devel - keyboard_input_non-us_layout: + full_screen = yes config_test = "nonus_layout" only rv_input_rhel6devel - keyboard_input_type_and_func_keys: + full_screen = yes config_test = "type_and_func_keys" only rv_input_rhel6devel - keyboard_input_leds_migration: + full_screen = yes config_test = "leds_migration" only rv_input_rhel6devel - qxl_logging: @@ -534,11 +456,14 @@ variants: logtest = spice-vdagent only rv_logging_rhel6devel -#Running all Logging Tests -#only spice_vdagent_logging, qxl_logging +#Running all RHEL Client, RHEL Guest Spice Tests +only create_vms, negative_qemu_spice_launch_badport, negative_qemu_spice_launch_badic, negative_qemu_spice_launch_badjpegwc, negative_qemu_spice_launch_badzlib, negative_qemu_spice_launch_badsv, negative_qemu_spice_launch_badpc, remote_viewer_test, remote_viewer_ssl_test, remote_viewer_disconnect_test, guestvmshutdown_cmd, guestvmshutdown_qemu, copy_client_to_guest_largetext_pos, copy_guest_to_client_largetext_pos, copy_client_to_guest_pos, copy_guest_to_client_pos, copy_guest_to_client_neg, copy_client_to_guest_neg, copyimg_client_to_guest_pos, copyimg_client_to_guest_neg, copyimg_guest_to_client_pos, copyimg_guest_to_client_neg, copyimg_client_to_guest_dcp_neg, copyimg_guest_to_client_dcp_neg, copy_guest_to_client_dcp_neg, copy_client_to_guest_dcp_neg, copybmpimg_client_to_guest_pos, copybmpimg_guest_to_client_pos, copy_guest_to_client_largetext_10mb_pos, copy_client_to_guest_largetext_10mb_pos, copyimg_medium_client_to_guest_pos, copyimg_medium_guest_to_client_pos, copyimg_large_client_to_guest_pos, copyimg_large_guest_to_client_pos, restart_vdagent_copy_client_to_guest_pos, restart_vdagent_copy_guest_to_client_pos, restart_vdagent_copyimg_client_to_guest_pos, restart_vdagent_copyimg_guest_to_client_pos, restart_vdagent_copybmpimg_client_to_guest_pos, restart_vdagent_copybmpimg_guest_to_client_pos, restart_vdagent_copy_client_to_guest_largetext_pos, restart_vdagent_copy_guest_to_client_largetext_pos, remote_viewer_fullscreen_test, remote_viewer_fullscreen_test_neg, spice_vdagent_logging, qxl_logging, keyboard_input_leds_and_esc_keys, keyboard_input_non-us_layout, keyboard_input_type_and_func_keys, keyboard_input_leds_migration, rv_connect_passwd, rv_connect_wrong_passwd, rv_qemu_password, rv_qemu_password_overwrite + +#Running all RHEL Client, Windows Guest Spice Tests +#only install_win_guest, remote_viewer_winguest_test -#Spice Vdagent Tests: -#only copy_client_to_guest_largetext_pos, copy_guest_to_client_largetext_pos, copy_client_to_guest_pos, copy_guest_to_client_pos, copy_guest_to_client_neg, copy_client_to_guest_neg, copyimg_client_to_guest_pos, copyimg_client_to_guest_neg, copyimg_guest_to_client_pos, copyimg_guest_to_client_neg, copyimg_client_to_guest_dcp_neg, copyimg_guest_to_client_dcp_neg, copy_guest_to_client_dcp_neg, copy_client_to_guest_dcp_neg, copybmpimg_client_to_guest_pos, copybmpimg_guest_to_client_pos, copy_guest_to_client_largetext_10mb_pos, copy_client_to_guest_largetext_10mb_pos, copyimg_medium_client_to_guest_pos, copyimg_medium_guest_to_client_pos, copyimg_large_client_to_guest_pos, copyimg_large_guest_to_client_pos, restart_vdagent_copy_client_to_guest_pos, only restart_vdagent_copy_guest_to_client_pos, restart_vdagent_copyimg_client_to_guest_pos, restart_vdagent_copyimg_guest_to_client_pos, restart_vdagent_copybmpimg_client_to_guest_pos, restart_vdagent_copybmpimg_guest_to_client_pos, restart_vdagent_copy_client_to_guest_largetext_pos, restart_vdagent_copy_guest_to_client_largetext_pos +#Running all Windows Client, RHEL Guest Spice Tests +#to be added -#Running all Spice Tests -only create_vms, install_win_guest, negative_qemu_spice_launch_badport, negative_qemu_spice_launch_badic, negative_qemu_spice_launch_badjpegwc, negative_qemu_spice_launch_badzlib, negative_qemu_spice_launch_badsv, negative_qemu_spice_launch_badpc, remote_viewer_test, remote_viewer_ssl_test, remote_viewer_winguest_test, remote_viewer_disconnect_test, copy_client_to_guest_largetext_pos, copy_guest_to_client_largetext_pos, copy_client_to_guest_pos, copy_guest_to_client_pos, copy_guest_to_client_neg, copy_client_to_guest_neg, copyimg_client_to_guest_pos, copyimg_client_to_guest_neg, copyimg_guest_to_client_pos, copyimg_guest_to_client_neg, copyimg_client_to_guest_dcp_neg, copyimg_guest_to_client_dcp_neg, copy_guest_to_client_dcp_neg, copy_client_to_guest_dcp_neg, copybmpimg_client_to_guest_pos, copybmpimg_guest_to_client_pos, copy_guest_to_client_largetext_10mb_pos, copy_client_to_guest_largetext_10mb_pos, copyimg_medium_client_to_guest_pos, copyimg_medium_guest_to_client_pos, copyimg_large_client_to_guest_pos, copyimg_large_guest_to_client_pos, restart_vdagent_copy_client_to_guest_pos, only restart_vdagent_copy_guest_to_client_pos, restart_vdagent_copyimg_client_to_guest_pos, restart_vdagent_copyimg_guest_to_client_pos, restart_vdagent_copybmpimg_client_to_guest_pos, restart_vdagent_copybmpimg_guest_to_client_pos, restart_vdagent_copy_client_to_guest_largetext_pos, restart_vdagent_copy_guest_to_client_largetext_pos, remote_viewer_fullscreen_test, remote_viewer_fullscreen_test_neg, spice_vdagent_logging, qxl_logging, keyboard_input_leds_and_esc_keys, keyboard_input_non-us_layout, keyboard_input_type_and_func_keys, keyboard_input_leds_migration +#Running all Windows Client, Windows Guest Spice Tests +#to be added diff --git a/qemu/tests/cfg/fullscreen_setup.cfg b/qemu/tests/cfg/fullscreen_setup.cfg deleted file mode 100644 index 0bc09a496..000000000 --- a/qemu/tests/cfg/fullscreen_setup.cfg +++ /dev/null @@ -1,23 +0,0 @@ -- fullscreen_setup: - no JeOS - type = fullscreen_setup - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_connect.cfg b/qemu/tests/cfg/rv_connect.cfg deleted file mode 100644 index 4b4a4c543..000000000 --- a/qemu/tests/cfg/rv_connect.cfg +++ /dev/null @@ -1,24 +0,0 @@ -- rv_connect: - no JeOS - type = rv_connect - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - full_screen = no - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_connect_win.cfg b/qemu/tests/cfg/rv_connect_win.cfg deleted file mode 100644 index 6422d4250..000000000 --- a/qemu/tests/cfg/rv_connect_win.cfg +++ /dev/null @@ -1,28 +0,0 @@ -- rv_connect_win: - no JeOS - type = rv_connect - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - os_type_vm2 = linux - shell_prompt_vm2 = ^\[.*\][\#\$]\s*$ - shell_client_vm2 = ssh - username_vm2 = root - shell_port_vm2 = 22 - status_test_command_vm2 = echo $? - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_copyandpaste.cfg b/qemu/tests/cfg/rv_copyandpaste.cfg deleted file mode 100644 index f0782b34c..000000000 --- a/qemu/tests/cfg/rv_copyandpaste.cfg +++ /dev/null @@ -1,40 +0,0 @@ -- rv_copyandpaste: rv_connect - no JeOS - type = rv_copyandpaste - vms = vm1 vm2 - shell_prompt_vm2 = ^\[.*\][\#\$]\s*$ - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - interpreter = python - dst_dir = /tmp - guest_script = cb.py - script_params_img_set = --set_image - script_params_img_save = -m - script_params_writef = -f - script_params_createf = -n - final_textfile = StringLengthTest.txt - final_image = PNGTest.png - image_tocopy_name = Image-small.png - final_image_bmp = BMPTest.bmp - image_tocopy_name_bmp = Image2.bmp - image_type = png - script_params = --set - script_params_clear = --clear - text_to_test = Testing_this_text_was_copied - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_disconnect.cfg b/qemu/tests/cfg/rv_disconnect.cfg deleted file mode 100644 index c064cf837..000000000 --- a/qemu/tests/cfg/rv_disconnect.cfg +++ /dev/null @@ -1,23 +0,0 @@ -- rv_disconnect: rv_connect - no JeOS - type = rv_disconnect - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_fullscreen.cfg b/qemu/tests/cfg/rv_fullscreen.cfg deleted file mode 100644 index a3fb611a1..000000000 --- a/qemu/tests/cfg/rv_fullscreen.cfg +++ /dev/null @@ -1,24 +0,0 @@ -- rv_fullscreen: rv_connect - no JeOS - type = rv_fullscreen - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_input.cfg b/qemu/tests/cfg/rv_input.cfg deleted file mode 100644 index 8890498b0..000000000 --- a/qemu/tests/cfg/rv_input.cfg +++ /dev/null @@ -1,24 +0,0 @@ -- rv_input: rv_connect - type = rv_input - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - full_screen = "False" - guest_script = key_event_form.py - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client diff --git a/qemu/tests/cfg/rv_logging.cfg b/qemu/tests/cfg/rv_logging.cfg deleted file mode 100644 index 2a8782ea3..000000000 --- a/qemu/tests/cfg/rv_logging.cfg +++ /dev/null @@ -1,32 +0,0 @@ -- rv_logging: rv_connect - type = rv_logging - logtest = qxl - qxl_log = /var/log/Xorg.0.log - spice_log = /var/log/spice-vdagent.log - vms = vm1 vm2 - guest_vm = vm1 - client_vm = vm2 - image_name_vm2 = client_vm - display_vm2 = vnc - vga_vm2 = cirrus - interpreter = python - dst_dir = /tmp - guest_script = cb.py - script_params = --set - text_to_test = Testing_this_text_was_copied - virtio_ports_vm1 = "vdagent" - virtio_port_type_vm1 = "serialport" - virtio_port_chardev_vm1 = "spicevmc" - virtio_port_name_prefix_vm1 = "com.redhat.spice." - - variants: - - RHEL: - variants: - # This is current solution of handling - # multiple guests running exact same OS - -6.3.x86_64: - image_name_vm2 = images/rhel6devel-64_client - -6.3.i386: - image_name_vm2 = images/rhel6devel-32_client - - diff --git a/qemu/tests/cfg/spice.cfg b/qemu/tests/cfg/spice.cfg new file mode 100644 index 000000000..96edbb117 --- /dev/null +++ b/qemu/tests/cfg/spice.cfg @@ -0,0 +1,92 @@ +- rv: + no JeOS + vms = vm1 vm2 + guest_vm = vm1 + client_vm = vm2 + display_vm2 = vnc + vga_vm2 = cirrus + full_screen = no + virtio_ports_vm1 = "vdagent" + virtio_port_type_vm1 = "serialport" + virtio_port_chardev_vm1 = "spicevmc" + virtio_port_name_prefix_vm1 = "com.redhat.spice." + + variants: + -RHEL.6.3.x86_64: + image_name_vm2 = images/rhel63-64_client + -RHEL.6.3.i386: + image_name_vm2 = images/rhel63-32_client + -RHEL.6.devel.x86_64: + image_name_vm2 = images/rhel6devel-64_client + -RHEL.6.devel.i386: + image_name_vm2 = images/rhel6devel-32_client + variants: + -fullscreen_setup: + type = fullscreen_setup + -rv_connect: + type = rv_connect + -rv_disconnect: rv_connect + type = rv_disconnect + -rv_fullscreen: fullscreen_setup, rv_connect + type = rv_fullscreen + -rv_copyandpaste: rv_connect + type = rv_copyandpaste + interpreter = python + dst_dir = /tmp + guest_script = cb.py + script_params_img_set = --set_image + script_params_img_save = -m + script_params_writef = -f + script_params_createf = -n + final_textfile = StringLengthTest.txt + final_image = PNGTest.png + image_tocopy_name = Image-small.png + final_image_bmp = BMPTest.bmp + image_tocopy_name_bmp = Image2.bmp + image_type = png + script_params = --set + script_params_clear = --clear + text_to_test = Testing_this_text_was_copied + - rv_input: rv_connect + type = rv_input + guest_script = key_event_form.py + - rv_logging: rv_connect + type = rv_logging + logtest = qxl + qxl_log = /var/log/Xorg.0.log + spice_log = /var/log/spice-vdagent.log + interpreter = python + dst_dir = /tmp + guest_script = cb.py + script_params = --set + text_to_test = Testing_this_text_was_copied + - rv_vmshutdown: rv_connect + type = rv_vmshutdown + cmd_cli_shutdown = "shutdown -h now" + cmd_qemu_shutdown = "system_powerdown" + - client_guest_shutdown: + type = client_guest_shutdown + shutdown_method = shell + kill_vm = yes + kill_vm_gracefully = no + + variants: + #variant for a RHEL client and a RHEL guest + -rr: + #variant for a RHEL client and a Windows guest + -rw: + pssword = 1q2w3eP + password_vm2 = 123456 + display_vm2 = vnc + os_type_vm2 = linux + shell_prompt_vm2 = ^\[.*\][\#\$]\s*$ + shell_client_vm2 = ssh + username_vm2 = root + shell_port_vm2 = 22 + status_test_command_vm2 = echo $? + + #variant for a Windows client and a RHEL guest + -wr: + #variant for a Windows client and a Windows guest + -ww: +