From ce3295ea2cffd8a4f25d5b7ad6f93bf25ed64086 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Tue, 31 May 2016 23:47:04 +0200 Subject: lvc: make alternate loginprompts configurable --- cucumber/features/images/DebianLoginPromptLXDE_d9.png | Bin 0 -> 1151 bytes cucumber/features/images/DebianLoginPromptXFCE_2.png | Bin 8934 -> 0 bytes cucumber/features/images/DebianLoginPromptXFCE_d9.png | Bin 0 -> 1152 bytes cucumber/features/step_definitions/common_steps.rb | 11 ++++++++++- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 cucumber/features/images/DebianLoginPromptLXDE_d9.png delete mode 100644 cucumber/features/images/DebianLoginPromptXFCE_2.png create mode 100644 cucumber/features/images/DebianLoginPromptXFCE_d9.png diff --git a/cucumber/features/images/DebianLoginPromptLXDE_d9.png b/cucumber/features/images/DebianLoginPromptLXDE_d9.png new file mode 100644 index 00000000..cc768ad7 Binary files /dev/null and b/cucumber/features/images/DebianLoginPromptLXDE_d9.png differ diff --git a/cucumber/features/images/DebianLoginPromptXFCE_2.png b/cucumber/features/images/DebianLoginPromptXFCE_2.png deleted file mode 100644 index 2503d0a3..00000000 Binary files a/cucumber/features/images/DebianLoginPromptXFCE_2.png and /dev/null differ diff --git a/cucumber/features/images/DebianLoginPromptXFCE_d9.png b/cucumber/features/images/DebianLoginPromptXFCE_d9.png new file mode 100644 index 00000000..5e23ce47 Binary files /dev/null and b/cucumber/features/images/DebianLoginPromptXFCE_d9.png 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 -- cgit v1.2.3-54-g00ecf