From 95425953ec8190c8e276a7bd3c37a69c94a4a51f Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Sun, 30 Oct 2016 15:04:14 +0100 Subject: lvc: drop some unneeded cleverness re. LVM names Signed-off-by: Holger Levsen --- cucumber/features/install.feature | 4 ++-- cucumber/features/step_definitions/common_steps.rb | 5 ++--- cucumber/features/step_definitions/snapshots.rb | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'cucumber') diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature index 79b164ef..369679fa 100644 --- a/cucumber/features/install.feature +++ b/cucumber/features/install.feature @@ -27,7 +27,7 @@ Feature: Doing variations on d-i installs And I allow reboot after the install is complete And I wait for the reboot And I power off the computer - And the computer is set to boot from ide drive "#{JOB_NAME}" + And the computer is set to boot from ide drive When I start the computer Then I should see a Gnome Login prompt @@ -52,5 +52,5 @@ Feature: Doing variations on d-i installs When I start the computer And I select the install mode And the VM shuts down within 20 minutes - And the computer is set to boot from ide drive "#{JOB_NAME}" + And the computer is set to boot from ide drive 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 8085c048..be5e887d 100644 --- a/cucumber/features/step_definitions/common_steps.rb +++ b/cucumber/features/step_definitions/common_steps.rb @@ -152,9 +152,8 @@ Given /^the computer is set to boot from the Tails DVD$/ do $vm.set_cdrom_boot(TAILS_ISO) end -Given /^the computer is set to boot from (.+?) drive "(.+?)"$/ do |type, name| - debug_log("debug: setting computer to boot from drive: name='#{name}' (type=#{type})", :color => :blue) - $vm.set_disk_boot(name, type.downcase) +Given /^the computer is set to boot from (.+?) drive$/ do |type| + $vm.set_disk_boot(JOB_NAME, type.downcase) end Given /^I (temporarily )?create a (\d+) ([[:alpha:]]+) disk named "([^"]+)"$/ do |temporary, size, unit, name| diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb index d90293ad..d3d343d5 100644 --- a/cucumber/features/step_definitions/snapshots.rb +++ b/cucumber/features/step_definitions/snapshots.rb @@ -42,7 +42,7 @@ def checkpoints 'I allow reboot after the install is complete', 'I wait for the reboot', 'I power off the computer', - 'the computer is set to boot from ide drive "'+JOB_NAME+'"', + 'the computer is set to boot from ide drive', ] } end -- cgit v1.2.3-70-g09d2