summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-03-23 15:29:04 +0100
committeranonym <anonym@riseup.net>2017-03-25 00:24:17 +0100
commitb2c7d793a03d44e5a652851ace1da5633758684f (patch)
tree8c5251b49489ad182dc137f4e4c946e051fc6274
parent266e35b48601a20b45f8348bd2cbad4da09b6c2f (diff)
WIP: tests
-rw-r--r--features/step_definitions/common_steps.rb40
-rw-r--r--features/step_definitions/snapshots.rb7
-rw-r--r--features/support/hooks.rb24
-rw-r--r--features/tor_bootstrapping.feature602
-rw-r--r--features/tor_rebootstrapping.feature402
m---------submodules/chutney0
6 files changed, 1060 insertions, 15 deletions
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 7fb7846..b79272d 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -70,11 +70,11 @@ def post_snapshot_restore_hook
if $vm.has_network?
if $vm.execute("systemctl --quiet is-active tor@default.service").success?
$vm.execute("systemctl stop tor@default.service")
- $vm.execute("rm -f /var/log/tor/log")
+ #$vm.execute("rm -f /var/log/tor/log")
$vm.execute("systemctl --no-block restart tails-tor-has-bootstrapped.target")
$vm.host_to_guest_time_sync
$vm.execute("systemctl restart tor@default.service")
- wait_until_tor_is_working
+# wait_until_tor_is_working
if $vm.file_content('/proc/cmdline').include?(' i2p')
$vm.execute_successfully('/usr/local/sbin/tails-i2p stop')
# we "killall tails-i2p" to prevent multiple
@@ -125,10 +125,6 @@ Then /^drive "([^"]+)" is detected by Tails$/ do |name|
end
end
-Given /^the network is plugged$/ do
- $vm.plug_network
-end
-
Given /^the network is unplugged$/ do
$vm.unplug_network
end
@@ -312,7 +308,7 @@ Given /^the computer (re)?boots Tails$/ do |reboot|
Sikuli::Key.ENTER)
@screen.wait('TailsGreeter.png', 5*60)
$vm.wait_until_remote_shell_is_up
- step 'I configure Tails to use a simulated Tor network'
+# step 'I configure Tails to use a simulated Tor network'
end
Given /^I log in to a new session(?: in )?(|German)$/ do |lang|
@@ -1002,3 +998,33 @@ def share_host_files(files)
$vm.execute_successfully("chmod -R a+rX '#{mount_dir}'")
return mount_dir
end
+
+When /^I pause$/ do
+ pause
+end
+
+Given /^the network is plugged$/ do
+ $use_chutney = true
+ if $use_chutney
+ step 'I configure Tails to use a simulated Tor network'
+ end
+ $vm.plug_network
+end
+
+Given /^Tor has debug logging enabled$/ do
+ $vm.execute_successfully("echo 'Log debug file /var/log/tor/debug.log' >> /etc/tor/torrc")
+ $vm.execute_successfully("sync")
+end
+
+Then /^Tor eventually (?:re)?bootstraps$/ do
+ try_for(30, delay: 0) { $vm.has_process?('tor') }
+ $vm.execute_successfully('touch /time_is_synced')
+ t0 = Time.now
+ try_for(60) do
+ progress = $vm.execute_successfully(
+ 'tor_bootstrap_progress', :libs => 'tor'
+ ).stdout.chomp.to_i
+ debug_log "Bootstrap progress: #{progress} : #{Time.now - t0}"
+ progress == 100
+ end
+end
diff --git a/features/step_definitions/snapshots.rb b/features/step_definitions/snapshots.rb
index 7199464..2c1937e 100644
--- a/features/step_definitions/snapshots.rb
+++ b/features/step_definitions/snapshots.rb
@@ -6,7 +6,8 @@ def checkpoints
:steps => [
'the network is unplugged',
'I start the computer',
- 'the computer boots Tails'
+ 'the computer boots Tails',
+ 'Tor has debug logging enabled',
],
},
@@ -49,9 +50,7 @@ def checkpoints
:parent_checkpoint => "no-network-logged-in",
:steps => [
'the network is plugged',
- 'Tor is ready',
- 'all notifications have disappeared',
- 'available upgrades have been checked',
+ 'Tor eventually bootstraps',
],
},
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 35e9f2d..450142e 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -125,8 +125,8 @@ def add_after_scenario_hook(&block)
@after_scenario_hooks << block
end
-def save_failure_artifact(type, path)
- $failure_artifacts << [type, path]
+def save_failure_artifact(type, path, tag = nil)
+ $failure_artifacts << [type, path, tag]
end
# Due to Tails' Tor enforcement, we only allow contacting hosts that
@@ -249,9 +249,25 @@ After('@product') do |scenario|
save_failure_artifact("Network capture", pcap_file)
end
end
+ begin
+ tor_debug_log = "#{$config["TMPDIR"]}/tor_debug.log"
+ open(tor_debug_log, 'w') do |f|
+ f.write($vm.file_content("/var/log/tor/debug.log"))
+ end
+ save_failure_artifact("Tor debug log", tor_debug_log)
+ rescue
+ # $vm.file_content will fail if the remote shell is down
+ end
+ if $use_chutney
+ Dir.glob("#{$config['TMPDIR']}/chutney-data/nodes/*/debug.log") do |f|
+ name = File.basename(File.dirname(f))
+ save_failure_artifact("Tor debug log #{name}", tor_debug_log, name)
+ end
+ end
$failure_artifacts.sort!
- $failure_artifacts.each do |type, file|
- artifact_name = sanitize_filename("#{elapsed}_#{scenario.name}#{File.extname(file)}")
+ $failure_artifacts.each do |type, file, tag|
+ tag = "_#{tag}" if tag
+ artifact_name = sanitize_filename("#{elapsed}_#{scenario.name}#{tag}#{File.extname(file)}")
artifact_path = "#{ARTIFACTS_DIR}/#{artifact_name}"
assert(File.exist?(file))
FileUtils.mv(file, artifact_path)
diff --git a/features/tor_bootstrapping.feature b/features/tor_bootstrapping.feature
new file mode 100644
index 0000000..2ea8e4d
--- /dev/null
+++ b/features/tor_bootstrapping.feature
@@ -0,0 +1,602 @@
+@product
+Feature: Debug Tor
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And Tor has debug logging enabled
+ When the network is plugged
+ Then Tor eventually bootstraps
diff --git a/features/tor_rebootstrapping.feature b/features/tor_rebootstrapping.feature
new file mode 100644
index 0000000..b4ff8a0
--- /dev/null
+++ b/features/tor_rebootstrapping.feature
@@ -0,0 +1,402 @@
+@product
+Feature: Debug Tor
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
+
+ Scenario: No initial network
+ Given I have started Tails from DVD and logged in and the network is connected
+ Then Tor eventually rebootstraps
diff --git a/submodules/chutney b/submodules/chutney
-Subproject 1a38ab2da85d72e750b64d364d3605eae0ed8de
+Subproject 48a3231f0787e871f14efbfb56488201d9a52eb