[Qa-jenkins-scm] [jenkins.debian.net] 04/07: lvc: maybe if we look for InstallGRUB first, it'll work

[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 73bb6306d7fa91b79b7a49f841b0eabbfff2d0c0
Author: Philip Hands <phil at hands.com>
Date:   Sat May 21 00:47:38 2016 +0200

    lvc: maybe if we look for InstallGRUB first, it'll work
    
    (cherry picked from commit 0da1a6abb9a9bae0d00811847308b8f5c0e523ea)
---
 cucumber/features/step_definitions/common_steps.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 1cb4968..10d59ba 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -475,8 +475,8 @@ Given /^in ([a-z]*) mode I wait while the bulk of the packages are installed$/ d
   debug_log("debug: we see InstallSoftware", :color => :blue)
   try_for(120*60, :msg => "it seems that the install stalled (timing-out after 2 hours)") do
     found = false
-    debug_log("debug: check for Installing Software/GRUBprogress", :color => :blue)
-    hit, _ = @screen.waitAny([diui_png("InstallSoftware",ui_mode),diui_png("InstallGRUB",ui_mode)], 2*60)
+    debug_log("debug: check for Install GRUB/Software", :color => :blue)
+    hit, _ = @screen.waitAny([diui_png("InstallGRUB",ui_mode),diui_png("InstallSoftware",ui_mode)], 2*60)
     if diui_png("InstallSoftware",ui_mode) == hit
       debug_log("debug: still there, so let's glance at tty4", :color => :blue)
       if "gui" == ui_mode

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