summaryrefslogtreecommitdiffstats
path: root/features
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-19 02:25:38 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-21 09:47:01 +0100
commit2e4f4c6c3be01266c8b5685ab80530b08208adb3 (patch)
tree05cf4095a7b39f829218470ca463895b930bc5fc /features
parentbc9261df47a5dc59b670142485329299c944f984 (diff)
downloadjenkins.debian.net-2e4f4c6c3be01266c8b5685ab80530b08208adb3.tar.xz
lvc: let the computer boot DebianLive7 instead of Tails
Diffstat (limited to 'features')
-rw-r--r--features/apt.feature2
-rw-r--r--features/images/DebianLive7BootSplash.pngbin0 -> 13399 bytes
-rw-r--r--features/images/DebianLive7BootSplashTabMsg.pngbin0 -> 4260 bytes
-rw-r--r--features/step_definitions/common_steps.rb6
4 files changed, 4 insertions, 4 deletions
diff --git a/features/apt.feature b/features/apt.feature
index e86d3c60..88174af9 100644
--- a/features/apt.feature
+++ b/features/apt.feature
@@ -9,7 +9,7 @@ Feature: Installing packages through APT
Given a computer
And I capture all network traffic
And I start the computer
- And the computer boots Tails
+ And the computer boots DebianLive7
And I enable more Tails Greeter options
And I set sudo password "asdf"
And I log in to a new session
diff --git a/features/images/DebianLive7BootSplash.png b/features/images/DebianLive7BootSplash.png
new file mode 100644
index 00000000..b64353aa
--- /dev/null
+++ b/features/images/DebianLive7BootSplash.png
Binary files differ
diff --git a/features/images/DebianLive7BootSplashTabMsg.png b/features/images/DebianLive7BootSplashTabMsg.png
new file mode 100644
index 00000000..150830b7
--- /dev/null
+++ b/features/images/DebianLive7BootSplashTabMsg.png
Binary files differ
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 532aa4fd..36c5b9b9 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -202,7 +202,7 @@ When /^I destroy the computer$/ do
@vm.destroy
end
-Given /^the computer (re)?boots Tails$/ do |reboot|
+Given /^the computer (re)?boots DebianLive7$/ do |reboot|
next if @skip_steps_while_restoring_background
case @os_loader
@@ -217,8 +217,8 @@ Given /^the computer (re)?boots Tails$/ do |reboot|
bootsplash_tab_msg = 'TailsBootSplashTabMsgPostReset.png'
boot_timeout = 120
else
- bootsplash = 'TailsBootSplash.png'
- bootsplash_tab_msg = 'TailsBootSplashTabMsg.png'
+ bootsplash = 'DebianLive7BootSplash.png'
+ bootsplash_tab_msg = 'DebianLive7BootSplashTabMsg.png'
boot_timeout = 30
end
end