summaryrefslogtreecommitdiffstats
path: root/cucumber
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-11-28 21:06:41 +0100
committerHolger Levsen <holger@layer-acht.org>2017-01-25 01:13:57 +0100
commita0d310c4ab5e3b1cab62fd2e2c6445e2560658b3 (patch)
treef4d2d729195644e5dd5151be8b9ff0ad9efb2164 /cucumber
parent90a42b0fee92511a13017f09e259b7e6d26f0da3 (diff)
downloadjenkins.debian.net-a0d310c4ab5e3b1cab62fd2e2c6445e2560658b3.tar.xz
lvc: Edu: continue to be patient while the LTSP chroot is installed
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber')
-rw-r--r--cucumber/features/images/d-i_gui_Edu-LTSPchroot.pngbin0 -> 3299 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_Edu-LTSPchroot.png b/cucumber/features/images/d-i_gui_Edu-LTSPchroot.png
new file mode 100644
index 00000000..f5a13ab3
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_Edu-LTSPchroot.png
Binary files differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 7fdb9cc1..3f7eb1b5 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -580,14 +580,14 @@ Given /^I wait while the bulk of the packages are installed$/ do
sleep(30)
debug_log("debug: check for Install GRUB/Software", :color => :blue)
if $vm.is_running?
- hit, _ = @screen.waitAny([diui_png("InstallGRUB"),diui_png("InstallGRUB-heading"),diui_png("InstallComplete"),diui_png("InstallationStepFailed"),diui_png("InstallSoftware")], 10)
+ hit, _ = @screen.waitAny([diui_png("InstallGRUB"),diui_png("InstallGRUB-heading"),diui_png("InstallComplete"),diui_png("InstallationStepFailed"),diui_png("InstallSoftware"),diui_png("Edu-LTSPchroot")], 10)
else
found = true
hit = ''
end
debug_log("debug: found #{hit}", :color => :blue)
case hit
- when diui_png("InstallSoftware"), diui_png("InstallationStepFailed")
+ when diui_png("InstallSoftware"), diui_png("Edu-LTSPchroot"), diui_png("InstallationStepFailed")
debug_log("debug: so let's glance at tty4", :color => :blue)
if "gui" == @ui_mode
@screen.type(Sikuli::Key.F4) # for this to work, we need to remap the keyboard -- CtrlAltF4 is apparently untypable :-(