diff options
| author | Philip Hands <phil@hands.com> | 2016-11-26 18:10:04 +0100 |
|---|---|---|
| committer | Philip Hands <phil@hands.com> | 2016-11-26 23:52:18 +0100 |
| commit | 1523f85fbf451c2c71ee8888fcbdbf05803e88ca (patch) | |
| tree | c2e0efd18dfae6537e8577104a2aae60838af043 /cucumber/features | |
| parent | c4b5283a9c7dc6d5fe48713f68fd332bd2d65ac5 (diff) | |
| download | jenkins.debian.net-1523f85fbf451c2c71ee8888fcbdbf05803e88ca.tar.xz | |
lvc: make the boot options code able to deal with included quotes
Diffstat (limited to 'cucumber/features')
| -rw-r--r-- | cucumber/features/install.feature | 4 | ||||
| -rw-r--r-- | cucumber/features/step_definitions/common_steps.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature index 9fd97b84..a5e0ef5a 100644 --- a/cucumber/features/install.feature +++ b/cucumber/features/install.feature @@ -73,7 +73,7 @@ Feature: Doing variations on d-i installs Scenario: Preseed using hands.com with checksum 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" + 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 And I start the computer And I select the install mode And I expect package installation to start @@ -87,7 +87,7 @@ 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 "desktop=lxde tasksel/first=desktop,lxde-desktop url=hands.com/d-i/bug/edu-plymouth/preseed.cfg" + And I intend to boot with options: desktop=lxde tasksel/first="desktop, lxde-desktop" 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 diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb index b7f29d4b..e616ddc1 100644 --- a/cucumber/features/step_definitions/common_steps.rb +++ b/cucumber/features/step_definitions/common_steps.rb @@ -197,7 +197,7 @@ Given /^I capture all network traffic$/ do end end -Given /^I intend to boot with options "([^"]*)"$/ do |options| +Given /^I intend to boot with options: (.*)$/ do |options| @boot_options = options end |