summaryrefslogtreecommitdiffstats
path: root/cucumber/features
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-11-03 23:43:49 +0100
committerHolger Levsen <holger@layer-acht.org>2016-11-04 00:35:18 +0100
commitc49abfff8a02dbf44ec55ef3aa94b02894042ca4 (patch)
tree797b99bca8e3fbf0abf97cff75f5d9f1a928262d /cucumber/features
parent4a893f4e0111a1207ab6726259b9e016e6287eb3 (diff)
downloadjenkins.debian.net-c49abfff8a02dbf44ec55ef3aa94b02894042ca4.tar.xz
lvc: look for the heading on the InstallGRUB page (helps preseeding)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/features')
-rw-r--r--cucumber/features/images/d-i_gui_InstallGRUB-heading.pngbin0 -> 7340 bytes
-rw-r--r--cucumber/features/step_definitions/common_steps.rb4
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 00000000..bfd59e67
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_InstallGRUB-heading.png
Binary files 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