summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-01-19 11:21:35 +0000
committerTails developers <amnesia@boum.org>2015-01-19 11:21:35 +0000
commitbfcacf2b03f2eb7764c7494360590067036402b1 (patch)
tree3ae087441f9b664ebc8a4d6267b41d5bc2857927
parent5ea0db31d7f59ac1c3b1d27043808030bebe88b8 (diff)
parent8564daa0190356e207123bad6cd5fd8f2400a2ef (diff)
Merge remote-tracking branch 'origin/bugfix/8714-tor-is-ready-robustness' into stable
-rw-r--r--features/checks.feature5
-rw-r--r--features/step_definitions/common_steps.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/features/checks.feature b/features/checks.feature
index 277bdb9..0d28784 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -14,6 +14,11 @@ Feature: Various checks
When Tails has booted a 64-bit kernel
Then the VirtualBox guest modules are available
+ Scenario: The 'Tor is ready' notification is shown when Tor has bootstrapped
+ Given the network is plugged
+ When I see the 'Tor is ready' notification
+ Then Tor is ready
+
Scenario: The shipped Tails signing key is up-to-date
Given the network is plugged
And Tor is ready
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 19496bb..f733e99 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -282,15 +282,15 @@ Then /^Tails seems to have booted normally$/ do
step "GNOME has started"
end
-Given /^Tor is ready$/ do
+When /^I see the 'Tor is ready' notification$/ do
next if @skip_steps_while_restoring_background
@screen.wait("GnomeTorIsReady.png", 300)
@screen.waitVanish("GnomeTorIsReady.png", 15)
+end
- # Having seen the "Tor is ready" notification implies that Tor has
- # built a circuit, but let's check it directly to be on the safe side.
+Given /^Tor is ready$/ do
+ next if @skip_steps_while_restoring_background
step "Tor has built a circuit"
-
step "the time has synced"
end