summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-02-09 15:16:27 +0100
committerTails developers <amnesia@boum.org>2015-02-09 15:16:27 +0100
commit5ec76042942c3802eb97d36be1e4809e4993979d (patch)
tree106b61d960f9d0f338108855ed394be883ba6d35
parentcc4ed3cab9fbed332ce51d6964042011e7590712 (diff)
Don't provide absolute paths to commands.
The remote shell now sets PATH properly, so let's implicitly test that too, for instance that our wrappers in /usr/loca/*bin are picked.
-rw-r--r--features/step_definitions/common_steps.rb2
-rw-r--r--features/step_definitions/erase_memory.rb4
-rw-r--r--features/step_definitions/firewall_leaks.rb2
-rw-r--r--features/step_definitions/tor.rb4
-rw-r--r--features/step_definitions/torified_misc.rb4
5 files changed, 8 insertions, 8 deletions
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 041dad7..959f4f6 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -56,7 +56,7 @@ def restore_background
@vm.host_to_guest_time_sync
@vm.execute("service tor start")
wait_until_tor_is_working
- @vm.spawn("/usr/local/sbin/restart-vidalia")
+ @vm.spawn("restart-vidalia")
end
end
end
diff --git a/features/step_definitions/erase_memory.rb b/features/step_definitions/erase_memory.rb
index 171f997..6f474ff 100644
--- a/features/step_definitions/erase_memory.rb
+++ b/features/step_definitions/erase_memory.rb
@@ -17,7 +17,7 @@ Given /^the computer is an old pentium without the PAE extension$/ do
end
def which_kernel
- kernel_path = @vm.execute("/usr/local/bin/tails-get-bootinfo kernel").stdout.chomp
+ kernel_path = @vm.execute("tails-get-bootinfo kernel").stdout.chomp
return File.basename(kernel_path)
end
@@ -105,7 +105,7 @@ Given /^I fill the guest's memory with a known pattern(| without verifying)$/ do
# since the others otherwise may continue re-filling the same memory
# unnecessarily.
instances = (@detected_ram_m.to_f/(2**10)).ceil
- instances.times { @vm.spawn('/usr/local/sbin/fillram; killall fillram') }
+ instances.times { @vm.spawn('fillram; killall fillram') }
# We make sure that the filling has started...
try_for(10, { :msg => "fillram didn't start" }) {
@vm.has_process?("fillram")
diff --git a/features/step_definitions/firewall_leaks.rb b/features/step_definitions/firewall_leaks.rb
index bf3a00c..a7e0544 100644
--- a/features/step_definitions/firewall_leaks.rb
+++ b/features/step_definitions/firewall_leaks.rb
@@ -29,7 +29,7 @@ end
Given(/^I disable Tails' firewall$/) do
next if @skip_steps_while_restoring_background
- @vm.execute("/usr/local/sbin/do_not_ever_run_me")
+ @vm.execute("do_not_ever_run_me")
iptables = @vm.execute("iptables -L -n -v").stdout.chomp.split("\n")
for line in iptables do
if !line[/Chain (INPUT|OUTPUT|FORWARD) \(policy ACCEPT/] and
diff --git a/features/step_definitions/tor.rb b/features/step_definitions/tor.rb
index 8651d4f..01062cd 100644
--- a/features/step_definitions/tor.rb
+++ b/features/step_definitions/tor.rb
@@ -250,7 +250,7 @@ end
And /^I re-run tails-security-check$/ do
next if @skip_steps_while_restoring_background
- @vm.execute_successfully("/usr/local/bin/tails-security-check", $live_user)
+ @vm.execute_successfully("tails-security-check", $live_user)
end
And /^I re-run htpdate$/ do
@@ -263,7 +263,7 @@ end
And /^I re-run tails-upgrade-frontend-wrapper$/ do
next if @skip_steps_while_restoring_background
- @vm.execute_successfully("/usr/local/bin/tails-upgrade-frontend-wrapper", $live_user)
+ @vm.execute_successfully("tails-upgrade-frontend-wrapper", $live_user)
end
When /^I connect Gobby to "([^"]+)"$/ do |host|
diff --git a/features/step_definitions/torified_misc.rb b/features/step_definitions/torified_misc.rb
index 694d111..efe4798 100644
--- a/features/step_definitions/torified_misc.rb
+++ b/features/step_definitions/torified_misc.rb
@@ -1,7 +1,7 @@
When /^I query the whois directory service for "([^"]+)"$/ do |domain|
next if @skip_steps_while_restoring_background
@vm_execute_res = @vm.execute(
- "/usr/local/bin/whois '#{domain}'",
+ "whois '#{domain}'",
$live_user)
end
@@ -10,7 +10,7 @@ When /^I wget "([^"]+)" to stdout(?:| with the '([^']+)' options)$/ do |url, opt
arguments = "-O - '#{url}'"
arguments = "#{options} #{arguments}" if options
@vm_execute_res = @vm.execute(
- "/usr/local/bin/wget #{arguments}",
+ "wget #{arguments}",
$live_user)
end