Commit cc4be7d0 authored by anonym's avatar anonym
Browse files

Test suite: fix fallout from bad merge conflict resolutions.

Mistakes were made in these resolutions:

* d197378c
* a3873e14
parent f0bfd4df
...@@ -14,7 +14,8 @@ Feature: Installing packages through APT ...@@ -14,7 +14,8 @@ Feature: Installing packages through APT
Given I have started Tails from DVD and logged in with an administration password and the network is connected Given I have started Tails from DVD and logged in with an administration password and the network is connected
When I configure APT to use non-onion sources When I configure APT to use non-onion sources
And I update APT using apt And I update APT using apt
Then I should be able to install a package using apt And I install "cowsay" using Synaptic
Then the package "cowsay" is installed
@check_tor_leaks @check_tor_leaks
Scenario: Install packages using Synaptic Scenario: Install packages using Synaptic
......
...@@ -166,6 +166,11 @@ When /^I fail to "([^"]*)" Tails to USB drive "([^"]+)"$/ do |mode, name| ...@@ -166,6 +166,11 @@ When /^I fail to "([^"]*)" Tails to USB drive "([^"]+)"$/ do |mode, name|
end end
end end
Given /^I plug and mount a USB drive containing the Tails ISO$/ do
iso_dir = share_host_files(TAILS_ISO)
@iso_path = "#{iso_dir}/#{File.basename(TAILS_ISO)}"
end
When /^I do a "Upgrade from ISO" on USB drive "([^"]+)"$/ do |name| When /^I do a "Upgrade from ISO" on USB drive "([^"]+)"$/ do |name|
step 'I start Tails Installer in "Upgrade from ISO" mode' step 'I start Tails Installer in "Upgrade from ISO" mode'
@installer.child('Use existing Live system ISO:', roleName: 'label') @installer.child('Use existing Live system ISO:', roleName: 'label')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment