[Qa-jenkins-scm] [jenkins.debian.net] 01/01: work around being offered American English after selecting UK

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 3769320be4aea15ae5f9b0c470deea67cb65e09d
Author: Philip Hands <phil at hands.com>
Date:   Tue Oct 11 23:14:39 2016 +0200

    work around being offered American English after selecting UK
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/images/d-i_gui_AmericanEnglish.png | Bin 0 -> 4430 bytes
 cucumber/features/step_definitions/common_steps.rb   |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cucumber/features/images/d-i_gui_AmericanEnglish.png b/cucumber/features/images/d-i_gui_AmericanEnglish.png
new file mode 100644
index 0000000..a8b3ea0
Binary files /dev/null and b/cucumber/features/images/d-i_gui_AmericanEnglish.png differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 8b06c83..05cd7a9 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -300,7 +300,8 @@ Given /^I select British English$/ do
   @screen.wait(diui_png("UnitedKingdom"), 10 * PATIENCE)
   @screen.type(Sikuli::Key.ENTER)
   @screen.click_point(@screen.w-2, @screen.h*2/3)
-  @screen.wait(diui_png("BritishEnglish"), 10 * PATIENCE)
+  # FIXME -- we're accepting AmmericanEnglish here, despite the fact it should be BritishEnglish due to the above -- looks like a D-I bug to me
+  on_screen, _ = @screen.waitAny([diui_png("BritishEnglish"),diui_png("AmericanEnglish")], 10 * PATIENCE)
   @screen.type(Sikuli::Key.ENTER)
 end
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git