summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-13 21:47:04 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-16 22:33:02 +0200
commit1355941538392b13de9915e0dbc3c608c11ba525 (patch)
tree871f1eb7139d9025abc9b6d13fcb1b86ca02dc58
parent2f788e3a92f4a36bf0a0114ea9ac80887dc541dd (diff)
downloadjenkins.debian.net-1355941538392b13de9915e0dbc3c608c11ba525.tar.xz
lvc: handle the miniiso boot screen
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--cucumber/features/images/d-i_boot_miniiso.pngbin0 -> 9175 bytes
-rw-r--r--cucumber/features/step_definitions/common_steps.rb8
2 files changed, 5 insertions, 3 deletions
diff --git a/cucumber/features/images/d-i_boot_miniiso.png b/cucumber/features/images/d-i_boot_miniiso.png
new file mode 100644
index 00000000..166d01ee
--- /dev/null
+++ b/cucumber/features/images/d-i_boot_miniiso.png
Binary files differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 786c5fac..26951bcf 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -270,10 +270,12 @@ end
Given /^I select the install mode$/ do
boot_timeout = 60
- on_screen, _ = @screen.waitAny(["d-i_boot_graphical-default.png","d-i_boot_text-default.png"], boot_timeout * PATIENCE)
+ on_screen, _ = @screen.waitAny(["d-i_boot_graphical-default.png","d-i_boot_text-default.png","d-i_boot_miniiso.png"], boot_timeout * PATIENCE)
debug_log("debug: found '#{on_screen}' in the bootspash", :color => :blue)
- if ("d-i_boot_text-default.png" == on_screen) == ("gui" == @ui_mode)
- @screen.type(Sikuli::Key.DOWN)
+ if "d-i_boot_miniiso.png" != on_screen
+ if ("d-i_boot_text-default.png" == on_screen) == ("gui" == @ui_mode)
+ @screen.type(Sikuli::Key.DOWN)
+ end
end
#@screen.type(Sikuli::Key.TAB)