Merge lp:~dpniel/ubiquity/fix_1252215 into lp:ubiquity

[Dan Chapman ]

Just a quick MP, during english installations set the location to London, to make it easier in the future to test the keyboard layouts don't break anything. Non-english still uses a random choice from London, Paris, Madrid and Algiers

[Jean-Baptiste Lallement (jibel)]

LTGM! Thanks.

review: Approve

[Jean-Baptiste Lallement (jibel)]

*LGTM

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2013-11-19 09:07:08 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2013-11-19 11:59:29 +0000
@@ -540,13 +540,14 @@
                         "Expected location entry to be visible but it wasn't")
 
         location = ['London', 'Paris', 'Madrid', 'Algiers']
-        location_page.select_location(random.choice(location))
-        self._check_page_titles()
         if self.english_install:
+            location_page.select_location('London')
             self.eng_config = eng_label_values.stepLocation
             self.expectThat(self.current_page_title,
                             Equals(self.eng_config['page_title']))
-
+        else:
+            location_page.select_location(random.choice(location))
+        self._check_page_titles()
         self._check_navigation_buttons(continue_button=True, back_button=True,
                                        quit_button=False, skip_button=False)