diff options
| -rw-r--r-- | features/images/DebianLiveBootSplash.png | bin | 0 -> 1569 bytes | |||
| -rw-r--r-- | features/images/DebianLiveBootSplashTabMsg.png | bin | 0 -> 790 bytes | |||
| -rw-r--r-- | features/step_definitions/common_steps.rb | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/features/images/DebianLiveBootSplash.png b/features/images/DebianLiveBootSplash.png Binary files differnew file mode 100644 index 00000000..11ee1494 --- /dev/null +++ b/features/images/DebianLiveBootSplash.png diff --git a/features/images/DebianLiveBootSplashTabMsg.png b/features/images/DebianLiveBootSplashTabMsg.png Binary files differnew file mode 100644 index 00000000..cdddaf1d --- /dev/null +++ b/features/images/DebianLiveBootSplashTabMsg.png diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb index 1f151abf..d055645e 100644 --- a/features/step_definitions/common_steps.rb +++ b/features/step_definitions/common_steps.rb @@ -203,7 +203,7 @@ When /^I destroy the computer$/ do @vm.destroy end -Given /^the computer (re)?boots DebianLive7$/ do |reboot| +Given /^the computer (re)?boots DebianLive(|\d+)$/ do |reboot,version| next if @skip_steps_while_restoring_background case @os_loader @@ -218,8 +218,8 @@ Given /^the computer (re)?boots DebianLive7$/ do |reboot| bootsplash_tab_msg = 'TailsBootSplashTabMsgPostReset.png' boot_timeout = 120 else - bootsplash = 'DebianLive7BootSplash.png' - bootsplash_tab_msg = 'DebianLive7BootSplashTabMsg.png' + bootsplash = "DebianLive#{version}BootSplash.png" + bootsplash_tab_msg = "DebianLive#{version}BootSplashTabMsg.png" boot_timeout = 30 end end @@ -232,7 +232,7 @@ Given /^the computer (re)?boots DebianLive7$/ do |reboot| # add extra boot options here @screen.type(" live-getty console=tty0 console=ttyS0,9600n8 #{@boot_options}" + Sikuli::Key.ENTER) - @screen.wait('DebianLive7Greeter.png', 5*60) + @screen.wait("DebianLive#{version}Greeter.png", 5*60) @vm.wait_until_remote_shell_is_up activate_filesystem_shares end |
