[Qa-jenkins-scm] [jenkins.debian.net] 03/04: lvc: look for progress in preseed installs, to avoid timeouts

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 4a893f4e0111a1207ab6726259b9e016e6287eb3
Author: Philip Hands <phil at hands.com>
Date:   Thu Nov 3 19:44:33 2016 +0100

    lvc: look for progress in preseed installs, to avoid timeouts
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/install.feature                  | 6 ++++--
 cucumber/features/step_definitions/common_steps.rb | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 9c4aa21..5b48003 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 be5e887..bd119fd 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git