another bunch of tests

This commit is contained in:
Josef Skladanka 2015-01-30 10:35:13 +01:00
parent f346b08792
commit f9e75e315c
15 changed files with 147 additions and 118 deletions

49
main.pm
View File

@ -19,32 +19,43 @@ use testapi;
use autotest;
# Boot to anaconda Hub in English
autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm";
unless (get_var("KICKSTART"))
if (get_var("ENTRYPOINT"))
{
## Disk partitioning
if (get_var('DISK_GUIDED_EMPTY')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
}
elsif (get_var('DISK_GUIDED_MULTI')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm";
}
elsif (get_var('DISK_GUIDED_DELETE_ALL')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_delete_all.pm";
autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm";
}
else
{
autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm";
unless (get_var("KICKSTART"))
{
## Disk partitioning
if (get_var('DISK_GUIDED_EMPTY')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
}
elsif (get_var('DISK_GUIDED_MULTI')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm";
}
elsif (get_var('DISK_GUIDED_DELETE_ALL')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_delete_all.pm";
}
# Start installation, set user & root passwords, reboot
autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm";
}
# Start installation, set user & root passwords, reboot
autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm";
# Wait for the login screen
autotest::loadtest get_var('CASEDIR')."/tests/_wait_for_login_screen.pm";
if (get_var('DISK_GUIDED_MULTI'))
{
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi_postinstall.pm";
}
}
# Wait for the login screen
autotest::loadtest get_var('CASEDIR')."/tests/_wait_for_login_screen.pm";
if (get_var('DISK_GUIDED_MULTI'))
{
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi_postinstall.pm";
}
1;
# vim: set sw=4 et:

View File

@ -1,17 +1,17 @@
{
"tags": [
"ENV-DESKTOP-default",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US",
"anaconda_install_finish"
],
"area": [
{
"xpos": 905,
"ypos": 679,
"width": 96,
"height": 48,
"type": "match"
"type": "match",
"width": 76,
"xpos": 941,
"ypos": 686,
"height": 33
}
],
"tags": [
"anaconda_install_finish",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View File

@ -1,52 +1,59 @@
{
"area": [
{
"xpos": 168,
"ypos": 7,
"width": 227,
"height": 57,
"type": "match"
},
{
"xpos": 294,
"ypos": 139,
"width": 123,
"height": 31,
"type": "match"
},
{
"xpos": 693,
"ypos": 135,
"width": 101,
"height": 33,
"type": "match"
},
{
"xpos": 299,
"ypos": 207,
"width": 180,
"height": 33,
"type": "match"
},
{
"xpos": 297,
"ypos": 328,
"width": 203,
"height": 38,
"type": "match"
},
{
"xpos": 294,
"ypos": 443,
"width": 252,
"height": 40,
"type": "match"
}
],
"tags": [
"anaconda_main_hub",
"ENV-DESKTOP-default",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US"
"ENV-INSTLANG-en_US",
"ENV-FLAVOR-server"
],
"area": [
{
"width": 227,
"height": 57,
"xpos": 168,
"ypos": 7,
"type": "match"
},
{
"height": 33,
"ypos": 153,
"xpos": 266,
"width": 101,
"type": "match"
},
{
"width": 180,
"height": 33,
"xpos": 699,
"ypos": 155,
"type": "match"
},
{
"width": 203,
"height": 38,
"ypos": 346,
"xpos": 267,
"type": "match"
},
{
"type": "match",
"height": 40,
"ypos": 461,
"xpos": 264,
"width": 252
},
{
"height": 18,
"ypos": 236,
"xpos": 272,
"width": 36,
"type": "match"
},
{
"type": "match",
"height": 13,
"ypos": 240,
"xpos": 330,
"width": 40
}
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 100 KiB

View File

@ -1,17 +1,17 @@
{
"area": [
{
"xpos": 333,
"ypos": 80,
"width": 180,
"height": 47,
"type": "match"
}
],
"tags": [
"anaconda_select_install_lang",
"ENV-DESKTOP-default",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US"
"ENV-INSTLANG-en_US",
"ENV-FLAVOR-server"
],
"area": [
{
"height": 28,
"ypos": 110,
"xpos": 332,
"width": 88,
"type": "match"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

View File

@ -2,9 +2,9 @@
"area": [
{
"xpos": 203,
"ypos": 170,
"width": 389,
"ypos": 188,
"height": 100,
"width": 349,
"type": "match"
}
],

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View File

@ -1,24 +1,24 @@
{
"area": [
{
"xpos": 201,
"ypos": 176,
"type": "match",
"width": 380,
"height": 51
},
{
"xpos": 593,
"ypos": 172,
"type": "match",
"height": 70,
"width": 377
}
],
"tags": [
"anaconda_select_install_lang_english_selected",
"ENV-DESKTOP-default",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US"
],
"area": [
{
"type": "match",
"height": 51,
"ypos": 194,
"xpos": 200,
"width": 356
},
{
"type": "match",
"xpos": 593,
"ypos": 190,
"height": 70,
"width": 349
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 101 KiB

View File

@ -1,24 +1,31 @@
{
"area": [
{
"xpos": 77,
"ypos": 204,
"width": 182,
"height": 29,
"type": "match",
"width": 53,
"height": 24,
"xpos": 249,
"ypos": 147
},
{
"width": 114,
"height": 17,
"ypos": 216,
"xpos": 86,
"type": "match"
},
{
"xpos": 68,
"ypos": 231,
"width": 335,
"height": 17,
"xpos": 78,
"ypos": 232,
"height": 20,
"width": 264,
"type": "match"
}
],
"tags": [
"bootloader",
"ENV-DESKTOP-default",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US"
"ENV-INSTLANG-en_US",
"ENV-FLAVOR-server"
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -39,6 +39,10 @@ sub run {
assert_screen "anaconda_select_install_lang_english_selected", 3;
assert_and_click "anaconda_select_install_lang_continue";
if ( get_var("VERSION") eq "rawhide") {
assert_and_click "anaconda_rawhide_accept_fate";
}
# Anaconda hub
assert_screen "anaconda_main_hub", 300; #
}

View File

@ -6,11 +6,11 @@ sub run {
# Anaconda hub
assert_screen "anaconda_main_hub", 300; #
# Default install destination (hdd should be empty for new KVM machine)
assert_and_click "anaconda_main_hub_install_destination";
assert_and_click "anaconda_spoke_done";
# the only provided disk should be full
assert_and_click "anaconda_install_destination_reclaim_space_btn";
assert_and_click "anaconda_install_destination_delete_all_btn";