summaryrefslogtreecommitdiffstats
path: root/cucumber/features
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2017-01-24 22:39:10 +0100
committerHolger Levsen <holger@layer-acht.org>2017-01-25 01:13:58 +0100
commit346458383bc65c96acc06fcdc601c9cce2d09d81 (patch)
tree640f06aac0561b8d5735bfbb29e1fc093276bc70 /cucumber/features
parent39a4e81c691272a9a65eac40f53c5d4bdf4dc3f6 (diff)
downloadjenkins.debian.net-346458383bc65c96acc06fcdc601c9cce2d09d81.tar.xz
lvc: look out for the "No Kernel Modules" screen, and fail if seen
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/features')
-rw-r--r--cucumber/features/images/d-i_gui_NoKernelModules.pngbin0 -> 5994 bytes
-rw-r--r--cucumber/features/step_definitions/common_steps.rb11
2 files changed, 10 insertions, 1 deletions
diff --git a/cucumber/features/images/d-i_gui_NoKernelModules.png b/cucumber/features/images/d-i_gui_NoKernelModules.png
new file mode 100644
index 00000000..b89b6df4
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_NoKernelModules.png
Binary files differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 3f7eb1b5..497d6615 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -461,8 +461,17 @@ Given /^I select the non-GUI task$/ do
end
Given /^I select Combi Debian-Edu profile$/ do
- @screen.wait(diui_png("Edu-Profile"), 2 * 60 * PATIENCE)
+ on_screen, _ = @screen.waitAny([diui_png("Edu-Profile"),diui_png("NoKernelModules")], 2 * 60 * PATIENCE)
# just acept the default combination
+ if on_screen == diui_png("NoKernelModules")
+ if "gui" == @ui_mode
+ @screen.type(Sikuli::Key.F4) # for this to work, we need to remap the keyboard -- CtrlAltF4 is apparently untypable :-(
+ else
+ @screen.type(Sikuli::Key.F4, Sikuli::KeyModifier.ALT)
+ end
+ sleep(10)
+ raise "No Kernel Modules Found (probably version skew between the .iso and the archive)"
+ end
if "gui" == @ui_mode
@screen.wait(diui_png("CONTINUEunselected"), 10 * PATIENCE)