From b3e118fe7958a35d6d080c6836449b7ee0b00926 Mon Sep 17 00:00:00 2001 From: Garret Raziel Date: Thu, 19 Feb 2015 16:55:29 +0100 Subject: [PATCH] changes in install source test --- lib/anacondalog.pm | 6 ++++++ tests/_boot_to_anaconda.pm | 7 +------ tests/install_source_graphical.pm | 11 +++-------- tests/install_source_variation.pm | 9 +-------- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/lib/anacondalog.pm b/lib/anacondalog.pm index 04861970..62414357 100644 --- a/lib/anacondalog.pm +++ b/lib/anacondalog.pm @@ -16,7 +16,13 @@ sub post_fail_hook { # 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 Anaconda logs + type_string "cd / && tar czvf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*"; + send_key "ret"; + upload_logs "/tmp/anaconda_tb.tar.gz"; } } diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 040ad49d..3603416c 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -26,12 +26,7 @@ sub run { my $fedora_version = ""; my $repourl = ""; - if (get_var("VERSION") eq "rawhide"){ - $fedora_version = "rawhide"; - } - else { - $fedora_version = (split /_/, get_var("BUILD"))[0]; - } + $fedora_version = lc((split /_/, get_var("BUILD"))[0]); $repourl = "http://download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; type_string " inst.repo=".$repourl; diff --git a/tests/install_source_graphical.pm b/tests/install_source_graphical.pm index 118c3b77..6bb29573 100644 --- a/tests/install_source_graphical.pm +++ b/tests/install_source_graphical.pm @@ -6,7 +6,7 @@ sub run { # Anaconda hub assert_screen "anaconda_main_hub", 300; # - # Go into the Install Sourcre spoke + # Go into the Install Source spoke assert_and_click "anaconda_main_hub_installation_source"; @@ -22,14 +22,9 @@ sub run { # insert the url send_key "tab"; - my $fedora_version = ""; + my $fedora_version = lc((split /_/, get_var("BUILD"))[0]); my $repourl = ""; - if (get_var("VERSION") eq "rawhide"){ - $fedora_version = "rawhide"; - } - else { - $fedora_version = (split /_/, get_var("BUILD"))[0]; - + if ($fedora_version ne "rawhide"){ if (get_var("MIRRORLIST_GRAPHICAL")){ $fedora_version = "fedora-".$fedora_version; } diff --git a/tests/install_source_variation.pm b/tests/install_source_variation.pm index 0c6de541..eabcd42e 100644 --- a/tests/install_source_variation.pm +++ b/tests/install_source_variation.pm @@ -9,16 +9,9 @@ sub run { assert_screen "anaconda_main_hub"; # FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate - my $fedora_version = ""; + my $fedora_version = lc((split /_/, get_var("BUILD"))[0]); my $repourl = ""; - if (get_var("VERSION") eq "rawhide"){ - $fedora_version = "rawhide"; - } - else { - $fedora_version = (split /_/, get_var("BUILD"))[0]; - } - $repourl = "download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; # check that the repo was used