[Qa-jenkins-scm] [jenkins.debian.net] 01/03: lvc: if base install fails, try to look at tty4

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit b57ff2fde4379540409af951d7017fe23a56a2a3
Author: Philip Hands <phil at hands.com>
Date:   Sun Nov 13 20:50:44 2016 +0100

    lvc: if base install fails, try to look at tty4
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/images/d-i_gui_CheckSyslog.png   | Bin 0 -> 8963 bytes
 cucumber/features/images/d-i_text_CheckSyslog.png  | Bin 0 -> 5506 bytes
 cucumber/features/step_definitions/common_steps.rb |  12 +++++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cucumber/features/images/d-i_gui_CheckSyslog.png b/cucumber/features/images/d-i_gui_CheckSyslog.png
new file mode 100644
index 0000000..9c52c29
Binary files /dev/null and b/cucumber/features/images/d-i_gui_CheckSyslog.png differ
diff --git a/cucumber/features/images/d-i_text_CheckSyslog.png b/cucumber/features/images/d-i_text_CheckSyslog.png
new file mode 100644
index 0000000..f7d18b2
Binary files /dev/null and b/cucumber/features/images/d-i_text_CheckSyslog.png differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 6ebaf04..a7b0870 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -379,7 +379,17 @@ Given /^I select full-disk, single-filesystem partitioning$/ do
 end
 
 Given /^I note that the Base system is being installed$/ do
-  @screen.wait(diui_png("InstallingBaseSystem"), 30 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("CheckSyslog"),diui_png("InstallingBaseSystem")], 30 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("CheckSyslog"),diui_png("InstallingBaseSystem")], 30 * PATIENCE)
+  if diui_png("CheckSyslog") == on_screen
+    if "gui" == @ui_mode
+      @screen.type(Sikuli::Key.F4) # for this to work, we need to remap the keyboard -- CtrlAltF4 is apparently untypable :-(
+    else
+      @screen.type(Sikuli::Key.F4, Sikuli::KeyModifier.ALT)
+    end
+    sleep(10)
+    raise "Failed to install the Base system"
+  end
   debug_log("debug: Found InstallingBaseSystem. Wait for it to vanish", :color => :blue)
   @screen.waitVanish(diui_png("InstallingBaseSystem"), 15 * 60 * PATIENCE)
   debug_log("debug: InstallingBaseSystem vanished", :color => :blue)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git