diff options
| author | anonym <anonym@riseup.net> | 2017-03-23 02:09:46 +0100 |
|---|---|---|
| committer | anonym <anonym@riseup.net> | 2017-03-25 00:24:03 +0100 |
| commit | 266e35b48601a20b45f8348bd2cbad4da09b6c2f (patch) | |
| tree | 2b28a4656fbb1d64e3c46a0a77e79a0801760adf /features | |
| parent | f03e4f28e7be18922c526000b3c8451d5516ab9b (diff) | |
WIP: ISO
Diffstat (limited to 'features')
| -rw-r--r-- | features/step_definitions/common_steps.rb | 2 | ||||
| -rw-r--r-- | features/support/helpers/misc_helpers.rb | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb index 643af7b..7fb7846 100644 --- a/features/step_definitions/common_steps.rb +++ b/features/step_definitions/common_steps.rb @@ -73,7 +73,7 @@ def post_snapshot_restore_hook $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.spawn("restart-tor") + $vm.execute("systemctl restart tor@default.service") wait_until_tor_is_working if $vm.file_content('/proc/cmdline').include?(' i2p') $vm.execute_successfully('/usr/local/sbin/tails-i2p stop') diff --git a/features/support/helpers/misc_helpers.rb b/features/support/helpers/misc_helpers.rb index 4a55286..74ba024 100644 --- a/features/support/helpers/misc_helpers.rb +++ b/features/support/helpers/misc_helpers.rb @@ -158,14 +158,6 @@ end def wait_until_tor_is_working try_for(270) { $vm.execute('/usr/local/sbin/tor-has-bootstrapped').success? } -rescue Timeout::Error => e - c = $vm.execute("journalctl SYSLOG_IDENTIFIER=restart-tor") - if c.success? - debug_log("From the journal:\n" + c.stdout.sub(/^/, " ")) - else - debug_log("Nothing was in the journal about 'restart-tor'") - end - raise e end def convert_bytes_mod(unit) |