summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-11-03 19:44:33 +0100
committerHolger Levsen <holger@layer-acht.org>2016-11-04 00:35:18 +0100
commit4a893f4e0111a1207ab6726259b9e016e6287eb3 (patch)
treebc95cd3c7503c7b7ebd6c3dcf03f186f70fbb0c8
parent3f207262ce03585272043250a268a6b849fc5880 (diff)
downloadjenkins.debian.net-4a893f4e0111a1207ab6726259b9e016e6287eb3.tar.xz
lvc: look for progress in preseed installs, to avoid timeouts
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--cucumber/features/install.feature6
-rw-r--r--cucumber/features/step_definitions/common_steps.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 9c4aa217..5b48003b 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -49,9 +49,11 @@ Feature: Doing variations on d-i installs
Given a disk is created for Debian Installer tests
And I intend to use gui mode
And I intend to boot with options "auto=true priority=critical url=hands.com classes=jenkins.debian.org/pb10;loc/gb;hands.com/general-tweaks;setup/users;partition/atomic;desktop/lxde hands-off/checksigs=true DEBCONF_DEBUG=5"
- When I start the computer
+ And I start the computer
And I select the install mode
+ And I expect package installation to start
+ And I wait while the bulk of the packages are installed
And the VM shuts down within 20 minutes
- And the computer is set to boot from ide drive
+ When the computer is set to boot from ide drive
And I start the computer
Then I should see a LXDE Login prompt
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index be5e887d..bd119fde 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -293,6 +293,10 @@ Given /^I select the install mode$/ do
$vm.wait_until_remote_shell_is_up
end
+Given /^I expect package installation to start$/ do
+ @screen.wait(diui_png("InstallSoftware"), 20 * 60)
+end
+
Given /^I select British English$/ do
@screen.wait(diui_png("English"), 30 * PATIENCE)
@screen.type(Sikuli::Key.ENTER)