add a 'no swap partition' test

Summary:
since we did this live at Flock today, I figured I'd tidy it
up and submit it. This is an 'optional' test, but some people
do run this way so it'd be nice to have it. This adds another
little helper method in anacondatest.pm, for deleting partitions,
which works much like the others added in previous commits.

Test Plan: Schedule a test run, see if the test runs and works.

Reviewers: jskladan, garretraziel

Reviewed By: jskladan, garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D503
This commit is contained in:
Adam Williamson 2015-08-19 17:41:41 -04:00
parent 9092b31863
commit 95bc2657fb
7 changed files with 109 additions and 3 deletions

View File

@ -129,6 +129,13 @@ sub custom_change_fs {
assert_and_click "anaconda_part_update_settings"; assert_and_click "anaconda_part_update_settings";
} }
sub custom_delete_part {
my ($self, $part) = @_;
return if not $part;
assert_and_click "anaconda_part_select_$part";
assert_and_click "anaconda_part_delete";
}
1; 1;
# vim: set sw=4 et: # vim: set sw=4 et:

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 20,
"type": "match",
"width": 55,
"xpos": 65,
"ypos": 625
}
],
"tags": [
"anaconda_part_delete",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US",
"ENV-FLAVOR-generic_boot"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"height": 19,
"type": "match",
"width": 48,
"xpos": 51,
"ypos": 245
}
],
"properties": [],
"tags": [
"anaconda_part_select_swap",
"ENV-DISTRI-fedora",
"ENV-INSTLANG-en_US",
"ENV-FLAVOR-generic_boot"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

View File

@ -196,6 +196,16 @@
}, },
test_suite => { name => "server_lvmthin" }, test_suite => { name => "server_lvmthin" },
}, },
{
machine => { name => "64bit" },
product => {
arch => "x86_64",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "server_no_swap" },
},
{ {
machine => { name => "64bit" }, machine => { name => "64bit" },
product => { product => {
@ -426,6 +436,16 @@
}, },
test_suite => { name => "server_lvmthin" }, test_suite => { name => "server_lvmthin" },
}, },
{
machine => { name => "32bit" },
product => {
arch => "i386",
distri => "fedora",
flavor => "universal",
version => "*",
},
test_suite => { name => "server_no_swap" },
},
{ {
machine => { name => "32bit" }, machine => { name => "32bit" },
product => { product => {
@ -738,8 +758,17 @@
variables => "", variables => "",
}, },
{ {
name => "server_kickstart_hdd", name => "server_no_swap",
prio => 17, prio => 17,
settings => [
{ key => "PARTITIONING", value => "custom_no_swap" },
{ key => "ROOT_PASSWORD", value => "weakpassword" },
],
variables => "",
},
{
name => "server_kickstart_hdd",
prio => 18,
settings => [ settings => [
{ key => "KICKSTART", value => "1" }, { key => "KICKSTART", value => "1" },
{ key => "GRUB", value => "inst.ks=hd:vdb1:/root-user-crypted-net.ks" }, { key => "GRUB", value => "inst.ks=hd:vdb1:/root-user-crypted-net.ks" },
@ -753,7 +782,7 @@
}, },
{ {
name => "fedup_minimal", name => "fedup_minimal",
prio => 18, prio => 19,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
@ -764,7 +793,7 @@
}, },
{ {
name => "fedup_desktop", name => "fedup_desktop",
prio => 19, prio => 20,
settings => [ settings => [
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },

View File

@ -0,0 +1,35 @@
use base "anacondatest";
use strict;
use testapi;
sub run {
my $self = shift;
# Go to INSTALLATION DESTINATION and ensure the disk is selected.
# Because PARTITIONING starts with 'custom_', this will select custom.
$self->select_disks();
assert_and_click "anaconda_spoke_done";
# Manual partitioning spoke should be displayed
assert_and_click "anaconda_part_automatic";
$self->custom_delete_part('swap');
assert_and_click "anaconda_spoke_done";
# Deleting swap shows a warning and requires a second click to confirm
assert_and_click "anaconda_spoke_done";
assert_and_click "anaconda_part_accept_changes";
# Anaconda hub
assert_screen "anaconda_main_hub", 300; #
}
sub test_flags {
# without anything - rollback to 'lastgood' snapshot if failed
# 'fatal' - whole test suite is in danger if this fails
# 'milestone' - after this test succeeds, update 'lastgood'
# 'important' - if this fails, set the overall state to 'fail'
return { fatal => 1 };
}
1;
# vim: set sw=4 et: