diff options
| author | Philip Hands <phil@hands.com> | 2016-06-01 14:19:18 +0200 |
|---|---|---|
| committer | Philip Hands <phil@hands.com> | 2016-06-01 20:01:56 +0200 |
| commit | 4a5b9b9b9a841057f83bf9c5e2e322ca04b926d4 (patch) | |
| tree | 7cd7055988b077fe9d9ead8d8ec30b287e5a6b01 | |
| parent | 0090f28666ab2947544bcd1f8fd4f014e5e419d1 (diff) | |
| download | jenkins.debian.net-4a5b9b9b9a841057f83bf9c5e2e322ca04b926d4.tar.xz | |
lvc: combine gui/non gui checkpoints
| -rw-r--r-- | cucumber/features/install.feature | 12 | ||||
| -rw-r--r-- | cucumber/features/step_definitions/common_steps.rb | 6 | ||||
| -rw-r--r-- | cucumber/features/step_definitions/snapshots.rb | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature index 4900cd57..17156db4 100644 --- a/cucumber/features/install.feature +++ b/cucumber/features/install.feature @@ -9,12 +9,12 @@ Feature: Doing variations on d-i installs Then I should see a <login> Login prompt Examples: - | install_ui | target_ui | login | - | gui | LXDE Desktop | LXDE | - | gui | KDE Desktop | KDE | - | gui | Minimal | VT | - | gui | XFCE Desktop | XFCE | - | text | non-GUI | VT | + | install_ui | target_ui | login | + | gui | LXDE | LXDE | + | gui | KDE | KDE | + | gui | minimal | VT | + | gui | XFCE | XFCE | + | text | non-GUI | VT | # | gui | Gnome Desktop | Gnome | # Scenario: Get a useful error from a bogus HTTP proxy diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb index 188c6a21..20ed27b2 100644 --- a/cucumber/features/step_definitions/common_steps.rb +++ b/cucumber/features/step_definitions/common_steps.rb @@ -416,7 +416,7 @@ Given /^we reach the Tasksel prompt$/ do @screen.wait(diui_png("ChooseSoftware"), 5 * 60 * PATIENCE) end -Given /^I unset the Desktop task$/ do +Given /^I select the non-GUI task$/ do @screen.wait(diui_png("DesktopTask_Yes"), 2 * 60 * PATIENCE) # deal with post-snapshot screen flicker FIXME -- check if we really need this @@ -434,7 +434,7 @@ Given /^I unset the Desktop task$/ do @screen.type(Sikuli::Key.ENTER) end -Given /^I unset the Desktop and Print tasks$/ do +Given /^I select the minimal task$/ do @screen.wait(diui_png("DesktopTask_Yes"), 2 * 60 * PATIENCE) # deal with post-snapshot screen flicker FIXME -- check if we really need this @@ -461,7 +461,7 @@ Given /^I unset the Desktop and Print tasks$/ do @screen.type(Sikuli::Key.ENTER) end -Given /^I select the ([a-zA-Z]*) Desktop task$/ do |desktop| +Given /^I select the ([A-Z][[:alpha:]]*) task$/ do |desktop| @screen.wait(diui_png("DesktopTask_Yes"), 2 * 60 * PATIENCE) # deal with post-snapshot screen flicker -- FIXME this needs to be fixed via looking to see if the remote login is working before we look at the screen diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb index abd9073d..6ba5c929 100644 --- a/cucumber/features/step_definitions/snapshots.rb +++ b/cucumber/features/step_definitions/snapshots.rb @@ -23,13 +23,13 @@ def checkpoints ] } - ['Minimal', 'non-GUI', 'Gnome', 'XFCE', 'LXDE', 'KDE'].each do |de| + ['minimal', 'non-GUI', 'Gnome', 'XFCE', 'LXDE', 'KDE'].each do |de| cp["debian-#{m}-#{de}-install"] = { :description => "I install a #{de} Debian system, in #{m} mode", :parent_checkpoint => "boot-d-i-#{m}-to-tasksel", :steps => [ - 'I intend to use #{m} mode', - "I select the #{de} Desktop task", + "I intend to use #{m} mode", + "I select the #{de} task", 'I wait while the bulk of the packages are installed', 'I install GRUB', 'I allow reboot after the install is complete', |