summaryrefslogtreecommitdiffstats
path: root/features
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2016-07-31 18:23:50 +0200
committerbertagaz <bertagaz@ptitcanardnoir.org>2016-07-31 18:34:13 +0200
commit5fc4f10ce4908cb95a4b8c1faa0fd32d5a04bd02 (patch)
tree9933caf26d2c256f7f67ff4c0b7e22663b3d7ccc /features
parent46eddfa584ff805729209c7fd14faa28e9b30420 (diff)
Rescue more broadly FindFailed of the Kernel command line image.
Sometimes the virtual machine doesn't even starts syslinux, or freeze at this step, sometimes the virtual USB bus bugs (see #11588). Refs: #10777
Diffstat (limited to 'features')
-rw-r--r--features/step_definitions/common_steps.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index ad0fa1b..4114b9c 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -320,12 +320,10 @@ Given /^Tails is at the boot menu( after rebooting)?$/ do |reboot|
end
@screen.wait(boot_menu_cmdline_image, 15)
rescue FindFailed => e
- if @screen.exists('TailsBooting.png') || @screen.exists('TailsGreeter.png')
- debug_log('We missed the boot menu before we could deal with it, ' +
- 'resetting...')
- $vm.reset
- dealt_with_uefi_setup = false
- end
+ debug_log('We missed the boot menu before we could deal with it, ' +
+ 'resetting...')
+ dealt_with_uefi_setup = false
+ $vm.reset
retry
ensure
Process.kill("TERM", tab_spammer.pid)