[Qa-jenkins-scm] [jenkins.debian.net] 03/11: lvc: handle the miniiso boot screen

[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 1355941538392b13de9915e0dbc3c608c11ba525
Author: Philip Hands <phil at hands.com>
Date:   Mon Jun 13 21:47:04 2016 +0200

    lvc: handle the miniiso boot screen
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/images/d-i_boot_miniiso.png      | Bin 0 -> 9175 bytes
 cucumber/features/step_definitions/common_steps.rb |   8 +++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cucumber/features/images/d-i_boot_miniiso.png b/cucumber/features/images/d-i_boot_miniiso.png
new file mode 100644
index 0000000..166d01e
Binary files /dev/null and b/cucumber/features/images/d-i_boot_miniiso.png differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 786c5fa..26951bc 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -270,10 +270,12 @@ end
 Given /^I select the install mode$/ do
   boot_timeout = 60
 
-  on_screen, _ = @screen.waitAny(["d-i_boot_graphical-default.png","d-i_boot_text-default.png"], boot_timeout * PATIENCE)
+  on_screen, _ = @screen.waitAny(["d-i_boot_graphical-default.png","d-i_boot_text-default.png","d-i_boot_miniiso.png"], boot_timeout * PATIENCE)
   debug_log("debug: found '#{on_screen}' in the bootspash", :color => :blue)
-  if ("d-i_boot_text-default.png" == on_screen) == ("gui" == @ui_mode)
-    @screen.type(Sikuli::Key.DOWN) 
+  if "d-i_boot_miniiso.png" != on_screen
+    if ("d-i_boot_text-default.png" == on_screen) == ("gui" == @ui_mode)
+      @screen.type(Sikuli::Key.DOWN) 
+    end
   end
 
   #@screen.type(Sikuli::Key.TAB)

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