From 1422d2c0e2eee43cf6164f85eceeb08d65c6d0ac Mon Sep 17 00:00:00 2001 From: Garret Raziel Date: Wed, 13 May 2015 13:00:46 +0200 Subject: [PATCH] Add fedup_minimal test Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D358 --- lib/fedoralog.pm | 33 +++++++++++++++ main.pm | 6 +++ needles/console_command_success.json | 7 ++-- needles/console_command_success2.json | 18 ++++---- needles/console_f22_installed.json | 18 ++++++++ needles/console_f22_installed.png | Bin 0 -> 1386 bytes needles/console_password_required2.json | 18 ++++++++ needles/console_password_required2.png | Bin 0 -> 882 bytes needles/grub_fedup.json | 18 ++++++++ needles/grub_fedup.png | Bin 0 -> 3535 bytes needles/root_logged_in.json | 19 +++++---- needles/root_logged_in.png | Bin 1097 -> 1198 bytes needles/tmp_failed_proc.json | 18 ++++++++ needles/tmp_failed_proc.png | Bin 0 -> 6243 bytes templates | 23 +++++++++- tests/upgrade_postinstall_minimal.pm | 37 +++++++++++++++++ tests/upgrade_preinstall_minimal.pm | 50 ++++++++++++++++++++++ tests/upgrade_run_minimal.pm | 53 ++++++++++++++++++++++++ 18 files changed, 296 insertions(+), 22 deletions(-) create mode 100644 lib/fedoralog.pm create mode 100644 needles/console_f22_installed.json create mode 100644 needles/console_f22_installed.png create mode 100644 needles/console_password_required2.json create mode 100644 needles/console_password_required2.png create mode 100644 needles/grub_fedup.json create mode 100644 needles/grub_fedup.png create mode 100644 needles/tmp_failed_proc.json create mode 100644 needles/tmp_failed_proc.png create mode 100644 tests/upgrade_postinstall_minimal.pm create mode 100644 tests/upgrade_preinstall_minimal.pm create mode 100644 tests/upgrade_run_minimal.pm diff --git a/lib/fedoralog.pm b/lib/fedoralog.pm new file mode 100644 index 00000000..b586b356 --- /dev/null +++ b/lib/fedoralog.pm @@ -0,0 +1,33 @@ +package fedoralog; +use base 'basetest'; + +use testapi; + +sub post_fail_hook() { + my $self = shift; + my $password = get_var("ROOT_PASSWORD", "weakpassword"); + + send_key "ctrl-alt-f2"; + assert_screen "text_console_login", 20; + type_string "root"; + send_key "ret"; + assert_screen "console_password_required", 10; + type_string $password; + send_key "ret"; + + assert_screen "root_logged_in", 10; + + # Upload all ABRT logs + type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *"; + send_key "ret"; + upload_logs "/var/tmp/abrt/abrt.tar.gz"; + + # Upload /var/log + type_string "tar czvf /tmp/var_log.tar.gz /var/log"; + send_key "ret"; + upload_logs "/tmp/var_log.tar.gz"; +} + +1; + +# vim: set sw=4 et: diff --git a/main.pm b/main.pm index 7ed4f9ec..112ceaed 100644 --- a/main.pm +++ b/main.pm @@ -55,6 +55,12 @@ if (get_var("ENTRYPOINT")) { autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm"; } +elsif (get_var("UPGRADE")) +{ + autotest::loadtest get_var('CASEDIR')."/tests/upgrade_preinstall_".get_var("UPGRADE").".pm"; + autotest::loadtest get_var('CASEDIR')."/tests/upgrade_run_".get_var("UPGRADE").".pm"; + autotest::loadtest get_var('CASEDIR')."/tests/upgrade_postinstall_".get_var("UPGRADE").".pm"; +} else { autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm"; diff --git a/needles/console_command_success.json b/needles/console_command_success.json index 99976f01..b6681779 100644 --- a/needles/console_command_success.json +++ b/needles/console_command_success.json @@ -7,11 +7,12 @@ ], "area": [ { + "width": 1018, + "height": 13, "xpos": 0, "ypos": 0, - "width": 204, - "height": 13, "type": "match" } - ] + ], + "properties": [] } \ No newline at end of file diff --git a/needles/console_command_success2.json b/needles/console_command_success2.json index 2c3f7960..2584a77a 100644 --- a/needles/console_command_success2.json +++ b/needles/console_command_success2.json @@ -1,18 +1,18 @@ { - "area": [ - { - "height": 13, - "width": 204, - "ypos": 16, - "type": "match", - "xpos": 0 - } - ], "tags": [ "console_command_success", "ENV-DISTRI-fedora", "ENV-INSTLANG-en_US", "ENV-FLAVOR-server" ], + "area": [ + { + "type": "match", + "width": 1012, + "height": 13, + "xpos": 0, + "ypos": 16 + } + ], "properties": [] } \ No newline at end of file diff --git a/needles/console_f22_installed.json b/needles/console_f22_installed.json new file mode 100644 index 00000000..c42b9ba5 --- /dev/null +++ b/needles/console_f22_installed.json @@ -0,0 +1,18 @@ +{ + "properties": [], + "area": [ + { + "xpos": 0, + "ypos": 129, + "width": 238, + "height": 12, + "type": "match" + } + ], + "tags": [ + "console_f22_installed", + "ENV-DISTRI-fedora", + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-develop" + ] +} \ No newline at end of file diff --git a/needles/console_f22_installed.png b/needles/console_f22_installed.png new file mode 100644 index 0000000000000000000000000000000000000000..2442ad018a268419dd3c6f743d9b92e50291424e GIT binary patch literal 1386 zcmchV=~og66vbIWNptDs=tw0~#!1U`Y)sRWKqxvoxh6{EhAECpmb>JFSZ={Wu3!KVtOPYK+f@k__bXmlB^w$Vjs&Nz0ss)Wll^5cvT$v@>*kz;UY1nP81M3U zT?f+?bmlU|EDL()vYH?x7i`EW;_0Ki>vQ-(^*pa8+&NEZoZ5b@rThi$RADM5DkzCV z_9oFpKN%bZ0A{kS!jtzy%$#C;k{+;&rk-}9(H>mN^ zXq_mX-}Uaq8L@qup~g1x<9pNX0r+6P2KIrY^w@V_#9mMBGL56TcT+I9y=>Y8`Yj93qPePs;P89C2WiehOArPO-* z8;hmN7yL4AMXM0n%QRY#>H6FHADP-l+u2e2MvYZDR~X*{#d_-G&r{5O(H*K8n3^U* z(!S#~Sl9t(oDFi;)jhv*@~{3r>Uic_g84w?_QK*v7RAzPEU!AXVpU|SxE5fcGif@U zu-CFIdpTSH{rt#JlJl(^w^tEs3c95b^;%Ym0ADGN_bjyqtw#Vk8AR}emVg%+f?Rd0 zDcK_qQFB7<>`QyYu&|S*sSpPDzQ_Pb+@TIRufl7!Msdnz`;P zu`(>=9A+cPBFbwxz%%2^W04N7IL3Pr{zEyk`5YuLr4XBVsK z7yq0X4+`E!}UDX&U4z5f$d`&oztKQLsH|xJP4>?dD7ce?29w8_zXrECr|%YPdJ&T zlB=bLBH4&~=f?^dYhQYQ3)CLz%bX3=-F}-cRj8OqVn=4@Dto#lm0(3Ui*lNNDTeYhvIr51M?&Aa5EXo#3LHRNp`7crv4k%mvvr3j#W%a4^#G;1vt!-4) zRAEtf0TPaXzbH%p4$LNZpO&Q)!N_tglcSP1DTEJHw*~NkYKj#ce`#iKr@KXc=(G%| etm^+f1gA7`knAulQqdLu&Dsg;YTtw*-1!eKM|ipb literal 0 HcmV?d00001 diff --git a/needles/console_password_required2.json b/needles/console_password_required2.json new file mode 100644 index 00000000..322a8875 --- /dev/null +++ b/needles/console_password_required2.json @@ -0,0 +1,18 @@ +{ + "properties": [], + "area": [ + { + "xpos": 1, + "height": 17, + "width": 77, + "ypos": 79, + "type": "match" + } + ], + "tags": [ + "console_password_required", + "ENV-DISTRI-fedora", + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-server" + ] +} \ No newline at end of file diff --git a/needles/console_password_required2.png b/needles/console_password_required2.png new file mode 100644 index 0000000000000000000000000000000000000000..496918b19de972f77799cf2f86efe086333ea51a GIT binary patch literal 882 zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j85o&?R6|L-ACO`T@Ck7R(yLaj5>Bpv1C&q$GSrW$WJvu@?CBa{9v64EM+d&hWMit(?>?)g{!4bQ$^Vi)qr<}UNHt<1ALFaKiP z$8KSByGSFc&^BUST(V?b@rl<9vdb(}vMg7=?2G)ao_coEL%yB2tGe^H@%@;7{K@o> zmG$Btu3A%bGuHEHMsHm&{n5@uUcT!8sWso-H(rgJ*1wjoNPB1a{`$I?b}pJ#|L=X_ zxRJSK&0P1tEAMJlUb?cENzHezm*%a#wUu(8i%wqfON{JwR-HY;Hq%N=UrPV{!aI3+ z_v8$!R`8X6uU0s>@S>pAGvDoz>#|-IYb>?6C%@s!E}QcQg3c{8ni`OOx;tj-SIa3u zG56{@m+kXg?|s2KWZ6H#3nxO0Yx$One9z}!VbAKrH#PHD>4D$zf~$VNnxHH*tzYnH zpT$3k4-$_GKK!2kFg-52?36|7l4;*WlJ%AsEc?WtdNtsy#H_#nwoJ+Wem3;J(7ylY z4@5Hoqra{>Ea-RtmxbTHe*bfP7NeqO)k=*x#?;LX?uT|U&PZ=x6Sg)i7JB{egg4}5!=pRwJPdDoeRzt7xR zefrI+lCyX6w`%A8dt80bD&fh+AF8%;HnZ36`F;Ou^tuD-4mn~5X;%7o(-?2w_*QV| zjnJ2y-_x(ZH9J_BcYE`1UFKQO-qiKIWqOl(y5aSN$}_JIOydDMdf-6A+CS_rlTv@( S&s&rQa)qa>pUXO@geCxHlWGhA literal 0 HcmV?d00001 diff --git a/needles/grub_fedup.json b/needles/grub_fedup.json new file mode 100644 index 00000000..ba85f34a --- /dev/null +++ b/needles/grub_fedup.json @@ -0,0 +1,18 @@ +{ + "properties": [], + "area": [ + { + "xpos": 119, + "ypos": 51, + "width": 61, + "height": 10, + "type": "match" + } + ], + "tags": [ + "grub_fedup", + "ENV-DISTRI-fedora", + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-server" + ] +} \ No newline at end of file diff --git a/needles/grub_fedup.png b/needles/grub_fedup.png new file mode 100644 index 0000000000000000000000000000000000000000..e5d87a2aa59d99df778eea2002202a1696e69963 GIT binary patch literal 3535 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 MoP%}c*}$Lv10-Qh^8f$< literal 0 HcmV?d00001 diff --git a/needles/root_logged_in.json b/needles/root_logged_in.json index 901d58a5..ba1e828b 100644 --- a/needles/root_logged_in.json +++ b/needles/root_logged_in.json @@ -1,17 +1,18 @@ { + "properties": [], + "area": [ + { + "width": 156, + "xpos": 0, + "height": 19, + "ypos": 113, + "type": "match" + } + ], "tags": [ "root_logged_in", "ENV-DISTRI-fedora", "ENV-INSTLANG-en_US", "ENV-FLAVOR-server" - ], - "area": [ - { - "xpos": 0, - "ypos": 126, - "width": 156, - "height": 22, - "type": "match" - } ] } \ No newline at end of file diff --git a/needles/root_logged_in.png b/needles/root_logged_in.png index b26ce3447b72e31409cdb7f6f30ee5c06c182cae..c848bdc746e173d34ea392ec2d467d19a9dfb318 100644 GIT binary patch delta 1063 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 W=6&E`)v>vM3!K-vITqUUBL55XQ}-?a literal 0 HcmV?d00001 diff --git a/templates b/templates index d717028c..e3812e79 100755 --- a/templates +++ b/templates @@ -176,6 +176,16 @@ }, test_suite => { name => "server_kickstart_hdd" }, }, + { + machine => { name => "64bit" }, + product => { + arch => "x86_64", + distri => "fedora", + flavor => "universal", + version => "*", + }, + test_suite => { name => "fedup_minimal" }, + }, ], Machines => [ { @@ -369,7 +379,7 @@ }, { name => "server_kickstart_hdd", - prio => 13, + prio => 14, settings => [ { key => "KICKSTART", value => "1" }, { key => "GRUB", value => "inst.ks=hd:vdb1:/root-user-crypted-net.ks" }, @@ -381,5 +391,16 @@ ], variables => "", }, + { + name => "fedup_minimal", + prio => 15, + settings => [ + { key => "ROOT_PASSWORD", value => "weakpassword" }, + { key => "BOOTFROM", value => "c" }, + { key => "HDD_1", value => "disk_f21.img" }, + { key => "UPGRADE", value => "minimal" }, + ], + variables => "", + }, ], } diff --git a/tests/upgrade_postinstall_minimal.pm b/tests/upgrade_postinstall_minimal.pm new file mode 100644 index 00000000..1f1b480d --- /dev/null +++ b/tests/upgrade_postinstall_minimal.pm @@ -0,0 +1,37 @@ +use base "fedoralog"; +use strict; +use testapi; + +sub boot_and_login { + wait_still_screen 10; + + my $password = get_var("ROOT_PASSWORD", "weakpassword"); + + send_key "ctrl-alt-f3"; + assert_screen "text_console_login", 20; + type_string "root"; + send_key "ret"; + assert_screen "console_password_required", 10; + type_string $password; + send_key "ret"; + assert_screen "root_logged_in", 10; +} + +sub run { + boot_and_login(); + + assert_screen "console_f22_installed"; +} + + +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: diff --git a/tests/upgrade_preinstall_minimal.pm b/tests/upgrade_preinstall_minimal.pm new file mode 100644 index 00000000..d5a961e9 --- /dev/null +++ b/tests/upgrade_preinstall_minimal.pm @@ -0,0 +1,50 @@ +use base "fedoralog"; +use strict; +use testapi; + +sub boot_and_login { + wait_still_screen 10; + + my $password = get_var("ROOT_PASSWORD", "weakpassword"); + + send_key "ctrl-alt-f3"; + assert_screen "text_console_login", 20; + type_string "root"; + send_key "ret"; + assert_screen "console_password_required", 10; + type_string $password; + send_key "ret"; + assert_screen "root_logged_in", 10; +} + +sub run { + boot_and_login(); + + type_string 'yum -y update; echo $?'; + send_key "ret"; + + assert_screen "console_command_success", 1800; + + type_string "reboot"; + send_key "ret"; + + boot_and_login(); + + type_string 'yum -y install fedup; echo $?'; + send_key "ret"; + + assert_screen "console_command_success", 1800; +} + + +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: diff --git a/tests/upgrade_run_minimal.pm b/tests/upgrade_run_minimal.pm new file mode 100644 index 00000000..5913c73d --- /dev/null +++ b/tests/upgrade_run_minimal.pm @@ -0,0 +1,53 @@ +use base "fedoralog"; +use strict; +use testapi; + +sub run { + my $fedup_url; + my $to_version; + # FIXME: this is just a workaround, see https://phab.qadevel.cloud.fedoraproject.org/T478 + if (get_var("BUILD") =~ /^(\d+)_Final_(.*)$/) { + $fedup_url = "https://dl.fedoraproject.org/pub/alt/stage/".$1."_".$2."/Server/".get_var("ARCH")."/os"; + $to_version = $1; + } else { + $fedup_url = "https://dl.fedoraproject.org/pub/alt/stage/".get_var("BUILD")."/Server/".get_var("ARCH")."/os"; + get_var("BUILD") =~ /^(\d+)/; + $to_version = $1; + } + + type_string "fedup --network ".$to_version." --instrepo ".$fedup_url; + send_key "ret"; + + wait_still_screen 30, 6000; # TODO: shorter timeout, longer stillscreen? + + upload_logs "/var/log/fedup.log"; + + type_string "reboot"; + send_key "ret"; + + assert_screen "grub_fedup", 30; + send_key "ret"; + + my $counter = 0; + + while (!check_screen ("text_console_login", 10) && $counter < 180) { + if (check_screen "tmp_failed_proc", 1) { + send_key "ctrl-alt-delete"; + } + $counter++; + } + assert_screen "text_console_login", 10; +} + + +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: