Skip to content

Commit

Permalink
Refactoring the config files for spice tests.
Browse files Browse the repository at this point in the history
Refactoring the config files by moving all the separate
cfg files per test to one, and removing the redundancies
set in each one. Refactoring the base tests-spice.cfg
to clean up the redundancies also and split up the tests
per platform to be tested on.

Signed-off-by: Vimal Patel <[email protected]>
Signed-off-by: Marian Krcmarik <[email protected]>
  • Loading branch information
vi-patel authored and krcmarik committed Feb 26, 2013
1 parent f49043d commit d690828
Show file tree
Hide file tree
Showing 10 changed files with 199 additions and 400 deletions.
289 changes: 107 additions & 182 deletions qemu/cfg/tests-spice.cfg

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions qemu/tests/cfg/fullscreen_setup.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions qemu/tests/cfg/rv_connect.cfg

This file was deleted.

28 changes: 0 additions & 28 deletions qemu/tests/cfg/rv_connect_win.cfg

This file was deleted.

40 changes: 0 additions & 40 deletions qemu/tests/cfg/rv_copyandpaste.cfg

This file was deleted.

23 changes: 0 additions & 23 deletions qemu/tests/cfg/rv_disconnect.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions qemu/tests/cfg/rv_fullscreen.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions qemu/tests/cfg/rv_input.cfg

This file was deleted.

32 changes: 0 additions & 32 deletions qemu/tests/cfg/rv_logging.cfg

This file was deleted.

92 changes: 92 additions & 0 deletions qemu/tests/cfg/spice.cfg
Original file line number Diff line number Diff line change
@@ -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:

1 comment on commit d690828

@lmr
Copy link

@lmr lmr commented on d690828 Feb 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks very nice!

Please sign in to comment.