ubiquity

Merge lp:~sil2100/ubiquity/xnox-lang-autopilot-fixes into lp:ubiquity

  1. xnox-lang-autopilot-fixes
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Jean-Baptiste Lallement
Approved revision: 6583
Merged at revision: 6584
Proposed branch: lp:~sil2100/ubiquity/xnox-lang-autopilot-fixes
Merge into: lp:ubiquity
Prerequisite: lp:~xnox/ubiquity/move-keyboard-early
Diff against target: 278 lines (+25/-25)
14 files modified
autopilot/ubiquity-autopilot-runner/jenkins/update-jenkins-job (+3/-3)
autopilot/ubiquity_autopilot_tests/tests/__init__.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_english_default.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py (+2/-2)
autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py (+2/-2)
ubiquity/plugins/ubi-console-setup.py (+1/-1)
ubiquity/plugins/ubi-timezone.py (+1/-1)
ubiquity/plugins/ubi-usersetup.py (+1/-1)
ubiquity/plugins/ubi-wireless.py (+1/-1)
To merge this branch: bzr merge lp:~sil2100/ubiquity/xnox-lang-autopilot-fixes
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+337162@code.launchpad.net

Commit message

On top of xnox's changes, introduce some autopilot fixes. We also introduce some code fixes to make all the normal tests pass.

Description of the change

On top of xnox's changes, introduce some autopilot fixes. We also introduce some code fixes to make all the normal tests pass.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Confirmed those are passing on a local autopilot run.

Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Thanks. verified that ap tests are passing. Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/update-jenkins-job'
2--- autopilot/ubiquity-autopilot-runner/jenkins/update-jenkins-job 2013-11-07 09:42:25 +0000
3+++ autopilot/ubiquity-autopilot-runner/jenkins/update-jenkins-job 2018-02-05 15:12:07 +0000
4@@ -32,7 +32,7 @@
5 import yaml
6 import urllib2
7 from textwrap import dedent
8-from pprint import pprint, pformat
9+from pprint import pformat
10
11 BASEDIR = os.path.dirname(__file__)
12 DEFAULT_CREDENTIALS = os.path.expanduser('~/.jenkins.credentials')
13@@ -81,7 +81,7 @@
14 raise IOError("'{}' is not a valid file".format(path))
15
16 logging.debug("Loading parameters from '{}'".format(path))
17- cfg = yaml.safe_load(file(path, 'r'))
18+ cfg = yaml.safe_load(open(path, 'r'))
19 return False if not cfg else cfg
20
21
22@@ -111,7 +111,7 @@
23
24 logging.debug("Loading credentials from '{}' for instance '{}'".format(
25 path, instance))
26- cred = yaml.safe_load(file(path, 'r'))
27+ cred = yaml.safe_load(open(path, 'r'))
28 return False if not instance in cred else cred[instance]
29
30
31
32=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
33--- autopilot/ubiquity_autopilot_tests/tests/__init__.py 2017-05-31 19:58:45 +0000
34+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py 2018-02-05 15:12:07 +0000
35@@ -521,7 +521,7 @@
36 def keyboard_layout_page_tests(self, ):
37 self._update_current_step('stepKeyboardConf')
38 self._check_navigation_buttons(continue_button=True, back_button=True,
39- quit_button=False, skip_button=False)
40+ quit_button=True, skip_button=False)
41 self._update_page_titles()
42 logger.debug("run_keyboard_layout_page_tests()")
43
44@@ -574,7 +574,7 @@
45 # TODO: Test detecting keyboard layout
46 self._check_page_titles()
47 self._check_navigation_buttons(continue_button=True, back_button=True,
48- quit_button=False, skip_button=False)
49+ quit_button=True, skip_button=False)
50
51 def user_info_page_tests(self, username, pwd,
52 encrypted=False, autologin=False):
53
54=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py'
55--- autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py 2014-06-30 13:09:16 +0000
56+++ autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py 2018-02-05 15:12:07 +0000
57@@ -35,6 +35,8 @@
58 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
59 self.welcome_page_tests(lang='English')
60 self.go_to_next_page()
61+ self.keyboard_layout_page_tests()
62+ self.go_to_next_page()
63 self.preparing_page_tests()
64 self.go_to_next_page()
65 if flavor == 'Edubuntu':
66@@ -53,8 +55,6 @@
67 self.go_to_next_page(wait=True)
68 self.location_page_tests()
69 self.go_to_next_page()
70- self.keyboard_layout_page_tests()
71- self.go_to_next_page()
72 self.user_info_page_tests('Autopilot', 'password')
73 self.go_to_progress_page()
74
75
76=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_default.py'
77--- autopilot/ubiquity_autopilot_tests/tests/test_english_default.py 2014-06-30 13:09:16 +0000
78+++ autopilot/ubiquity_autopilot_tests/tests/test_english_default.py 2018-02-05 15:12:07 +0000
79@@ -32,6 +32,8 @@
80 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
81 self.welcome_page_tests(lang='English')
82 self.go_to_next_page()
83+ self.keyboard_layout_page_tests()
84+ self.go_to_next_page()
85 self.preparing_page_tests()
86 self.go_to_next_page()
87 if flavor == 'Edubuntu':
88@@ -43,8 +45,6 @@
89 self.go_to_next_page(wait=True)
90 self.location_page_tests()
91 self.go_to_next_page()
92- self.keyboard_layout_page_tests()
93- self.go_to_next_page()
94 self.user_info_page_tests('Autopilot', 'password')
95 self.go_to_progress_page()
96
97
98=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py'
99--- autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py 2014-06-30 13:09:16 +0000
100+++ autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py 2018-02-05 15:12:07 +0000
101@@ -35,6 +35,8 @@
102 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
103 self.welcome_page_tests(lang='English')
104 self.go_to_next_page()
105+ self.keyboard_layout_page_tests()
106+ self.go_to_next_page()
107 self.preparing_page_tests()
108 self.go_to_next_page()
109 if flavor == 'Edubuntu':
110@@ -46,8 +48,6 @@
111 self.go_to_next_page(wait=True)
112 self.location_page_tests()
113 self.go_to_next_page()
114- self.keyboard_layout_page_tests()
115- self.go_to_next_page()
116 self.user_info_page_tests('Autopilot', 'password', encrypted=True)
117 self.go_to_progress_page()
118
119
120=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py'
121--- autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py 2014-06-30 13:09:16 +0000
122+++ autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py 2018-02-05 15:12:07 +0000
123@@ -32,6 +32,8 @@
124 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
125 self.welcome_page_tests(lang='English')
126 self.go_to_next_page()
127+ self.keyboard_layout_page_tests()
128+ self.go_to_next_page()
129 self.preparing_page_tests(updates=True, thirdParty=True)
130 self.go_to_next_page()
131 if flavor == 'Edubuntu':
132@@ -45,8 +47,6 @@
133 self.go_to_next_page(wait=True)
134 self.location_page_tests()
135 self.go_to_next_page()
136- self.keyboard_layout_page_tests()
137- self.go_to_next_page()
138 self.user_info_page_tests('Autopilot', 'password')
139 self.go_to_progress_page()
140
141
142=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py'
143--- autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py 2014-06-30 13:09:16 +0000
144+++ autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py 2018-02-05 15:12:07 +0000
145@@ -31,6 +31,8 @@
146 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
147 self.welcome_page_tests(lang='English')
148 self.go_to_next_page()
149+ self.keyboard_layout_page_tests()
150+ self.go_to_next_page()
151 self.preparing_page_tests(updates=True)
152 self.go_to_next_page()
153 if flavor == 'Edubuntu':
154@@ -42,8 +44,6 @@
155 self.go_to_next_page(wait=True)
156 self.location_page_tests()
157 self.go_to_next_page()
158- self.keyboard_layout_page_tests()
159- self.go_to_next_page()
160 self.user_info_page_tests('Autopilot', 'password')
161 self.go_to_progress_page()
162
163
164=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py'
165--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py 2014-06-30 13:09:16 +0000
166+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py 2018-02-05 15:12:07 +0000
167@@ -32,6 +32,8 @@
168 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
169 self.welcome_page_tests()
170 self.go_to_next_page()
171+ self.keyboard_layout_page_tests()
172+ self.go_to_next_page()
173 self.preparing_page_tests()
174 self.go_to_next_page()
175 if flavor == 'Edubuntu':
176@@ -43,8 +45,6 @@
177 self.go_to_next_page(wait=True)
178 self.location_page_tests()
179 self.go_to_next_page()
180- self.keyboard_layout_page_tests()
181- self.go_to_next_page()
182 self.user_info_page_tests('Autopilot', 'password')
183 self.go_to_progress_page()
184
185
186=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py'
187--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py 2014-06-30 13:09:16 +0000
188+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py 2018-02-05 15:12:07 +0000
189@@ -32,6 +32,8 @@
190 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
191 self.welcome_page_tests()
192 self.go_to_next_page()
193+ self.keyboard_layout_page_tests()
194+ self.go_to_next_page()
195 self.preparing_page_tests(updates=True, thirdParty=True)
196 self.go_to_next_page()
197 if flavor == 'Edubuntu':
198@@ -45,8 +47,6 @@
199 self.go_to_next_page(wait=True)
200 self.location_page_tests()
201 self.go_to_next_page()
202- self.keyboard_layout_page_tests()
203- self.go_to_next_page()
204 self.user_info_page_tests('Autopilot', 'password')
205 self.go_to_progress_page()
206
207
208=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py'
209--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py 2014-06-30 13:09:16 +0000
210+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py 2018-02-05 15:12:07 +0000
211@@ -31,6 +31,8 @@
212 self.assertThat(self.main_window.visible, Eventually(Equals(True)))
213 self.welcome_page_tests()
214 self.go_to_next_page()
215+ self.keyboard_layout_page_tests()
216+ self.go_to_next_page()
217 self.preparing_page_tests(updates=True)
218 self.go_to_next_page()
219 if flavor == 'Edubuntu':
220@@ -42,8 +44,6 @@
221 self.go_to_next_page(wait=True)
222 self.location_page_tests()
223 self.go_to_next_page()
224- self.keyboard_layout_page_tests()
225- self.go_to_next_page()
226 self.user_info_page_tests('Autopilot', 'password')
227 self.go_to_progress_page()
228
229
230=== modified file 'ubiquity/plugins/ubi-console-setup.py'
231--- ubiquity/plugins/ubi-console-setup.py 2017-09-07 12:18:10 +0000
232+++ ubiquity/plugins/ubi-console-setup.py 2018-02-05 15:12:07 +0000
233@@ -27,7 +27,7 @@
234
235
236 NAME = 'console_setup'
237-AFTER = 'timezone'
238+AFTER = 'language'
239 WEIGHT = 10
240
241
242
243=== modified file 'ubiquity/plugins/ubi-timezone.py'
244--- ubiquity/plugins/ubi-timezone.py 2017-12-22 21:42:39 +0000
245+++ ubiquity/plugins/ubi-timezone.py 2018-02-05 15:12:07 +0000
246@@ -33,7 +33,7 @@
247
248 NAME = 'timezone'
249 # after partman for default install, but language for oem install
250-AFTER = ['partman', 'language']
251+AFTER = ['partman', 'console_setup']
252 WEIGHT = 10
253
254 _geoname_url = 'https://geoname-lookup.ubuntu.com/?query=%s&release=%s'
255
256=== modified file 'ubiquity/plugins/ubi-usersetup.py'
257--- ubiquity/plugins/ubi-usersetup.py 2016-08-26 07:13:37 +0000
258+++ ubiquity/plugins/ubi-usersetup.py 2018-02-05 15:12:07 +0000
259@@ -35,7 +35,7 @@
260
261
262 NAME = 'usersetup'
263-AFTER = 'console_setup'
264+AFTER = 'timezone'
265 WEIGHT = 10
266
267
268
269=== modified file 'ubiquity/plugins/ubi-wireless.py'
270--- ubiquity/plugins/ubi-wireless.py 2017-03-06 16:54:28 +0000
271+++ ubiquity/plugins/ubi-wireless.py 2018-02-05 15:12:07 +0000
272@@ -24,7 +24,7 @@
273
274 NAME = 'wireless'
275 # after prepare for default install, but language for oem install
276-AFTER = 'language'
277+AFTER = 'console_setup'
278 WEIGHT = 12
279
280

Subscribers

People subscribed via source and target branches

to status/vote changes: