From 1355941538392b13de9915e0dbc3c608c11ba525 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Mon, 13 Jun 2016 21:47:04 +0200 Subject: lvc: handle the miniiso boot screen Signed-off-by: Holger Levsen --- cucumber/features/images/d-i_boot_miniiso.png | Bin 0 -> 9175 bytes cucumber/features/step_definitions/common_steps.rb | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 cucumber/features/images/d-i_boot_miniiso.png 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 Binary files /dev/null and b/cucumber/features/images/d-i_boot_miniiso.png 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) -- cgit v1.2.3-70-g09d2