[Qa-jenkins-scm] [jenkins.debian.net] 04/04: lvc: look for the heading on the InstallGRUB page (helps preseeding)

[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 c49abfff8a02dbf44ec55ef3aa94b02894042ca4
Author: Philip Hands <phil at hands.com>
Date:   Thu Nov 3 23:43:49 2016 +0100

    lvc: look for the heading on the InstallGRUB page (helps preseeding)
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/images/d-i_gui_InstallGRUB-heading.png | Bin 0 -> 7340 bytes
 cucumber/features/step_definitions/common_steps.rb       |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cucumber/features/images/d-i_gui_InstallGRUB-heading.png b/cucumber/features/images/d-i_gui_InstallGRUB-heading.png
new file mode 100644
index 0000000..bfd59e6
Binary files /dev/null and b/cucumber/features/images/d-i_gui_InstallGRUB-heading.png differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index bd119fd..fc05e8a 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -498,7 +498,7 @@ Given /^I wait while the bulk of the packages are installed$/ do
   try_for(120*60, :msg => "it seems that the install stalled (timing-out after 2 hours)") do
     found = false
     debug_log("debug: check for Install GRUB/Software", :color => :blue)
-    hit, _ = @screen.waitAny([diui_png("InstallGRUB"),diui_png("InstallationStepFailed"),diui_png("InstallSoftware")], 2*60)
+    hit, _ = @screen.waitAny([diui_png("InstallGRUB"),diui_png("InstallGRUB-heading"),diui_png("InstallationStepFailed"),diui_png("InstallSoftware")], 2*60)
     debug_log("debug: found #{hit}", :color => :blue)
     case hit
     when diui_png("InstallSoftware"), diui_png("InstallationStepFailed")
@@ -522,7 +522,7 @@ Given /^I wait while the bulk of the packages are installed$/ do
         debug_log("debug: pressed F1", :color => :blue)
         sleep(20)
       end
-    when diui_png("InstallGRUB")
+    when diui_png("InstallGRUB"), diui_png("InstallGRUB-heading")
       found = true
     end
 

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