From 68fcb0e60993b3f086fa49c34096f9c53e378133 Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Sat, 26 Nov 2016 23:21:04 +0100
Subject: lvc: try installing a Combi server (rumour has it that that works)

---
 cucumber/features/install.feature                  |  4 ++--
 cucumber/features/step_definitions/common_steps.rb | 12 ++++++++++++
 cucumber/features/step_definitions/snapshots.rb    |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'cucumber')

diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 3ad21e64..43b1d491 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -87,11 +87,11 @@ Feature: Doing variations on d-i installs
   Scenario: Install default Debian-Edu
     Given a disk is created for Debian Edu tests
     And I intend to use gui mode
-    And I intend to boot with options: url=hands.com/d-i/bug/edu-plymouth/preseed.cfg partman-auto/choose_recipe=atomic desktop=xfce
+    And I intend to boot with options: url=hands.com/d-i/bug/edu-plymouth/preseed.cfg
     And I start the computer
     And I select the install mode
     And I select British English
-    And I select Standalone Debian-Edu profile
+    And I select Combi Debian-Edu profile
     And I use the Debian-Edu Automatic Partitioning
     And I ignore Popcon
     And I set the root password to "rootme"
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index e616ddc1..5db44910 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -458,6 +458,18 @@ Given /^I select the non-GUI task$/ do
   @screen.type(Sikuli::Key.ENTER)
 end
 
+Given /^I select Combi Debian-Edu profile$/ do
+  @screen.wait(diui_png("Edu-Profile"), 2 * 60 * PATIENCE)
+  # just acept the default combination
+
+  if "gui" == @ui_mode
+    @screen.wait(diui_png("CONTINUEunselected"), 10 * PATIENCE)
+    @screen.type(Sikuli::Key.TAB)
+    @screen.wait(diui_png("CONTINUEselected"), 10 * PATIENCE)
+  end
+  @screen.type(Sikuli::Key.ENTER)
+end
+
 Given /^I select Standalone Debian-Edu profile$/ do
   @screen.wait(diui_png("Edu-Profile"), 2 * 60 * PATIENCE)
   @screen.type(Sikuli::Key.SPACE)
diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb
index ffdc88a3..94f71073 100644
--- a/cucumber/features/step_definitions/snapshots.rb
+++ b/cucumber/features/step_definitions/snapshots.rb
@@ -13,7 +13,7 @@ def checkpoints
     :description => "a disk is created for Debian Edu tests",
     :parent_checkpoint => nil,
     :steps => [
-      'I create a 40 GiB disk named "'+JOB_NAME+'"',
+      'I create a 70 GiB disk named "'+JOB_NAME+'"',
       'I plug ide drive "'+JOB_NAME+'"',
     ]
   }
-- 
cgit v1.2.3-70-g09d2