summaryrefslogtreecommitdiffstats
path: root/cucumber
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-11-26 23:21:04 +0100
committerPhilip Hands <phil@hands.com>2016-11-26 23:52:18 +0100
commit68fcb0e60993b3f086fa49c34096f9c53e378133 (patch)
treecabd291e75773ce55b5492d193f6fc65233ef689 /cucumber
parente3e36cd6fa95d49667dd868e1b07d328228e1b86 (diff)
downloadjenkins.debian.net-68fcb0e60993b3f086fa49c34096f9c53e378133.tar.xz
lvc: try installing a Combi server (rumour has it that that works)
Diffstat (limited to 'cucumber')
-rw-r--r--cucumber/features/install.feature4
-rw-r--r--cucumber/features/step_definitions/common_steps.rb12
-rw-r--r--cucumber/features/step_definitions/snapshots.rb2
3 files changed, 15 insertions, 3 deletions
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+'"',
]
}