Commit 18b65bf2 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'test/15379-adjust-to-python-upgrade-wrapper' into devel (Fix-committed: #15379)

parents 2b7e7da9 9052781b
...@@ -49,11 +49,11 @@ def persistent_volumes_mountpoints ...@@ -49,11 +49,11 @@ def persistent_volumes_mountpoints
end end
def recover_from_upgrader_failure def recover_from_upgrader_failure
$vm.execute('killall tails-upgrade-frontend tails-upgrade-frontend-wrapper zenity') $vm.execute('pkill --full tails-upgrade-frontend-wrapper')
# Remove unnecessary sleep for retry $vm.execute('killall tails-upgrade-frontend zenity')
$vm.execute_successfully('sed -i "/^sleep 30$/d" ' + # Do not sleep when retrying
'/usr/local/bin/tails-upgrade-frontend-wrapper') $vm.execute_successfully('/usr/local/bin/tails-upgrade-frontend-wrapper --no-wait')
$vm.spawn('tails-upgrade-frontend-wrapper', user: LIVE_USER) $vm.spawn('tails-upgrade-frontend-wrapper', user: LIVE_USER)
end end
Given /^I clone USB drive "([^"]+)" to a (new|temporary) USB drive "([^"]+)"$/ do |from, mode, to| Given /^I clone USB drive "([^"]+)" to a (new|temporary) USB drive "([^"]+)"$/ do |from, mode, to|
......
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