diff options
| author | Philip Hands <phil@hands.com> | 2016-11-13 20:50:44 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-11-15 11:06:29 +0100 |
| commit | b57ff2fde4379540409af951d7017fe23a56a2a3 (patch) | |
| tree | 96cba250f3ca6c21c20d36ef090dfb22521af817 | |
| parent | ff2e8594734a70c0d0383782758deeff10bafafa (diff) | |
| download | jenkins.debian.net-b57ff2fde4379540409af951d7017fe23a56a2a3.tar.xz | |
lvc: if base install fails, try to look at tty4
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rw-r--r-- | cucumber/features/images/d-i_gui_CheckSyslog.png | bin | 0 -> 8963 bytes | |||
| -rw-r--r-- | cucumber/features/images/d-i_text_CheckSyslog.png | bin | 0 -> 5506 bytes | |||
| -rw-r--r-- | cucumber/features/step_definitions/common_steps.rb | 12 |
3 files changed, 11 insertions, 1 deletions
diff --git a/cucumber/features/images/d-i_gui_CheckSyslog.png b/cucumber/features/images/d-i_gui_CheckSyslog.png Binary files differnew file mode 100644 index 00000000..9c52c29e --- /dev/null +++ b/cucumber/features/images/d-i_gui_CheckSyslog.png diff --git a/cucumber/features/images/d-i_text_CheckSyslog.png b/cucumber/features/images/d-i_text_CheckSyslog.png Binary files differnew file mode 100644 index 00000000..f7d18b28 --- /dev/null +++ b/cucumber/features/images/d-i_text_CheckSyslog.png diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb index 6ebaf047..a7b08701 100644 --- a/cucumber/features/step_definitions/common_steps.rb +++ b/cucumber/features/step_definitions/common_steps.rb @@ -379,7 +379,17 @@ Given /^I select full-disk, single-filesystem partitioning$/ do end Given /^I note that the Base system is being installed$/ do - @screen.wait(diui_png("InstallingBaseSystem"), 30 * PATIENCE) + on_screen, _ = @screen.waitAny([diui_png("CheckSyslog"),diui_png("InstallingBaseSystem")], 30 * PATIENCE) + on_screen, _ = @screen.waitAny([diui_png("CheckSyslog"),diui_png("InstallingBaseSystem")], 30 * PATIENCE) + if diui_png("CheckSyslog") == on_screen + 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 "Failed to install the Base system" + end debug_log("debug: Found InstallingBaseSystem. Wait for it to vanish", :color => :blue) @screen.waitVanish(diui_png("InstallingBaseSystem"), 15 * 60 * PATIENCE) debug_log("debug: InstallingBaseSystem vanished", :color => :blue) |
