summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-10-20 09:14:31 +0200
committerHolger Levsen <holger@layer-acht.org>2016-11-04 00:42:46 +0100
commit3e859c4e3a28472d25a46a77dcb0fedce3061693 (patch)
treec62d221bd74adb69e0cba3f6fd73d3851f06e6ae
parentc49abfff8a02dbf44ec55ef3aa94b02894042ca4 (diff)
downloadjenkins.debian.net-3e859c4e3a28472d25a46a77dcb0fedce3061693.tar.xz
Revert "lcv: work around being offered American English after selecting UK"
This reverts commit 3769320be4aea15ae5f9b0c470deea67cb65e09d, and commit 6702fb2019bff2d028bbc60e3ffcf05cf131c9b8. Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--cucumber/features/images/d-i_gui_AmericanEnglish.pngbin4430 -> 0 bytes
-rw-r--r--cucumber/features/images/d-i_text_AmericanEnglish.pngbin3418 -> 0 bytes
-rw-r--r--cucumber/features/step_definitions/common_steps.rb3
3 files changed, 1 insertions, 2 deletions
diff --git a/cucumber/features/images/d-i_gui_AmericanEnglish.png b/cucumber/features/images/d-i_gui_AmericanEnglish.png
deleted file mode 100644
index a8b3ea0b..00000000
--- a/cucumber/features/images/d-i_gui_AmericanEnglish.png
+++ /dev/null
Binary files differ
diff --git a/cucumber/features/images/d-i_text_AmericanEnglish.png b/cucumber/features/images/d-i_text_AmericanEnglish.png
deleted file mode 100644
index 08c718d7..00000000
--- a/cucumber/features/images/d-i_text_AmericanEnglish.png
+++ /dev/null
Binary files differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index fc05e8a7..6ebaf047 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -305,8 +305,7 @@ 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)
- # FIXME -- we're accepting AmmericanEnglish here, despite the fact it should be BritishEnglish due to the above - this seems to be #840209: console-setup: fails to change keyboard layout in d-i
- on_screen, _ = @screen.waitAny([diui_png("BritishEnglish"),diui_png("AmericanEnglish")], 10 * PATIENCE)
+ @screen.wait(diui_png("BritishEnglish"), 10 * PATIENCE)
@screen.type(Sikuli::Key.ENTER)
end