summaryrefslogtreecommitdiffstats
path: root/cucumber/features/step_definitions
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-05-21 00:47:38 +0200
committerHolger Levsen <holger@layer-acht.org>2016-05-21 11:34:13 +0200
commit73bb6306d7fa91b79b7a49f841b0eabbfff2d0c0 (patch)
tree642bdf2687444aa21fb4a26005c1c67914fd42f5 /cucumber/features/step_definitions
parent9a4d8fb735f98757f8250ee4d94b3a75b1d1d8c1 (diff)
downloadjenkins.debian.net-73bb6306d7fa91b79b7a49f841b0eabbfff2d0c0.tar.xz
lvc: maybe if we look for InstallGRUB first, it'll work
(cherry picked from commit 0da1a6abb9a9bae0d00811847308b8f5c0e523ea)
Diffstat (limited to 'cucumber/features/step_definitions')
-rw-r--r--cucumber/features/step_definitions/common_steps.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 1cb49687..10d59bac 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