From c49abfff8a02dbf44ec55ef3aa94b02894042ca4 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Thu, 3 Nov 2016 23:43:49 +0100 Subject: lvc: look for the heading on the InstallGRUB page (helps preseeding) Signed-off-by: Holger Levsen --- 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(-) create mode 100644 cucumber/features/images/d-i_gui_InstallGRUB-heading.png (limited to 'cucumber') 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 00000000..bfd59e67 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 bd119fde..fc05e8a7 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 -- cgit v1.2.3-70-g09d2