summaryrefslogtreecommitdiffstats
path: root/cucumber/features
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-05-31 23:47:04 +0200
committerPhilip Hands <phil@hands.com>2016-06-01 20:00:27 +0200
commitce3295ea2cffd8a4f25d5b7ad6f93bf25ed64086 (patch)
tree3a67bbd9a5f7bef23eebb31b4764942c2a60f2eb /cucumber/features
parent42a98b06ff710b595e562f53d81cc59e5ed28a02 (diff)
downloadjenkins.debian.net-ce3295ea2cffd8a4f25d5b7ad6f93bf25ed64086.tar.xz
lvc: make alternate loginprompts configurable
Diffstat (limited to 'cucumber/features')
-rw-r--r--cucumber/features/images/DebianLoginPromptLXDE_d9.pngbin0 -> 1151 bytes
-rw-r--r--cucumber/features/images/DebianLoginPromptXFCE_2.pngbin8934 -> 0 bytes
-rw-r--r--cucumber/features/images/DebianLoginPromptXFCE_d9.pngbin0 -> 1152 bytes
-rw-r--r--cucumber/features/step_definitions/common_steps.rb11
4 files changed, 10 insertions, 1 deletions
diff --git a/cucumber/features/images/DebianLoginPromptLXDE_d9.png b/cucumber/features/images/DebianLoginPromptLXDE_d9.png
new file mode 100644
index 00000000..cc768ad7
--- /dev/null
+++ b/cucumber/features/images/DebianLoginPromptLXDE_d9.png
Binary files differ
diff --git a/cucumber/features/images/DebianLoginPromptXFCE_2.png b/cucumber/features/images/DebianLoginPromptXFCE_2.png
deleted file mode 100644
index 2503d0a3..00000000
--- a/cucumber/features/images/DebianLoginPromptXFCE_2.png
+++ /dev/null
Binary files differ
diff --git a/cucumber/features/images/DebianLoginPromptXFCE_d9.png b/cucumber/features/images/DebianLoginPromptXFCE_d9.png
new file mode 100644
index 00000000..5e23ce47
--- /dev/null
+++ b/cucumber/features/images/DebianLoginPromptXFCE_d9.png
Binary files differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 49fd5eb6..188c6a21 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -552,7 +552,16 @@ Given /^I wait for the reboot$/ do
end
Given /^I should see a ([a-zA-Z]*) Login prompt$/ do |style|
- @screen.waitAny(["DebianLoginPrompt"+style+".png","DebianLoginPromptXFCE_2.png"], 20 * 60) # FIXME - this _2 image should be configurable
+ def loginPrompt
+ {
+ 'XFCE' => [ 'DebianLoginPromptXFCE.png', 'DebianLoginPromptXFCE_d9.png' ],
+ 'KDE' => [ 'DebianLoginPromptKDE.png', 'DebianLoginPromptKDE_d9.png' ],
+ 'LXDE' => [ 'DebianLoginPromptLXDE.png', 'DebianLoginPromptLXDE_d9.png' ],
+ 'VT' => [ 'DebianLoginPromptVT.png' ],
+ }
+ end
+
+ @screen.waitAny(loginPrompt[style], 20 * 60)
end
def bootsplash