From 20504fa965b372b332bdfbdc2acba5d356f89b2f Mon Sep 17 00:00:00 2001
From: Garret Raziel <boloomka@gmail.com>
Date: Thu, 19 Feb 2015 15:40:33 +0100
Subject: [PATCH] add ABRT logs uploading, sleep in lang selection

---
 lib/anacondalog.pm              | 6 +++++-
 tests/_boot_to_anaconda.pm      | 3 ++-
 tests/_do_install_and_reboot.pm | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/anacondalog.pm b/lib/anacondalog.pm
index 6d247664..04861970 100644
--- a/lib/anacondalog.pm
+++ b/lib/anacondalog.pm
@@ -7,12 +7,16 @@ sub post_fail_hook {
     my $self = shift;
     send_key "ctrl-alt-f2";
     if (check_screen "anaconda_console", 10) {
-        upload_logs "/tmp/X.log";  # TODO: it can't type "X"
+        upload_logs "/tmp/X.log";
         upload_logs "/tmp/anaconda.log";
         upload_logs "/tmp/packaging.log";
         upload_logs "/tmp/storage.log";
         upload_logs "/tmp/syslog";
         upload_logs "/tmp/program.log";
+
+        # Upload all ABRT logs
+        type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *";
+        upload_logs "/var/tmp/abrt/abrt.tar.gz";
     }
 }
 
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index 2cc18eed..040ad49d 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -43,12 +43,13 @@ sub run {
     {
         # Select install language
         assert_screen "anaconda_select_install_lang", 300;
+        sleep 4; # TODO: sometimes, input box is not focused. check if this solves it
         type_string "english";
         assert_and_click "anaconda_select_install_lang_english_filtered";
         assert_screen "anaconda_select_install_lang_english_selected", 3;
         assert_and_click "anaconda_select_install_lang_continue";
 
-        if ( get_var("VERSION") eq "rawhide") {
+        if ( check_screen "anaconda_rawhide_accept_fate" ) {
             assert_and_click "anaconda_rawhide_accept_fate";
         }
 
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 02404206..074cf616 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;