ubiquity

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

  1. bug_1267116
  2. Merge into trunk
Proposed by Dan Chapman 
Status: Merged
Merged at revision: 6108
Proposed branch: lp:~dpniel/ubiquity/bug_1267116
Merge into: lp:ubiquity
Diff against target: 140 lines (+28/-15)
7 files modified
autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py (+4/-2)
autopilot/ubiquity_autopilot_tests/tests/test_english_default.py (+4/-3)
autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py (+4/-2)
autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py (+4/-2)
autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py (+4/-2)
autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py (+4/-2)
autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py (+4/-2)
To merge this branch: bzr merge lp:~dpniel/ubiquity/bug_1267116
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Review via email: mp+205431@code.launchpad.net

Description of the change

I set the timeout to 15 minutes just to be on the 'safe' side for testing over the weekend

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

I wasn't able to run this change, but it's straightforward. The jobs will timeout after 1 hour, so if they do, we'll assume this did not work.

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_tests/tests/test_custom_install.py'
2--- autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py 2013-12-28 12:32:53 +0000
3+++ autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py 2014-02-07 17:27:15 +0000
4@@ -63,11 +63,13 @@
5 else:
6 self.go_to_progress_page()
7
8- self.progress_page_tests()
9+ #TODO Uncomment and return timout to 30 if made no difference
10+ # this is an attempt at a work around to avoid bug 1267116
11+ #self.progress_page_tests()
12 self.assertThat(lambda: self.app.select_single(
13 'GtkDialog',
14 name='finished_dialog').visible,
15- Eventually(Equals(True), timeout=30))
16+ Eventually(Equals(True), timeout=900))
17 #XXX: Uncomment if you want to restart after install complete
18 ## we need to sleep here to wait for dialog to fully load. It appears
19 ## in dbus before its actually visible. As the test has already passed
20
21=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_default.py'
22--- autopilot/ubiquity_autopilot_tests/tests/test_english_default.py 2013-12-28 12:32:53 +0000
23+++ autopilot/ubiquity_autopilot_tests/tests/test_english_default.py 2014-02-07 17:27:15 +0000
24@@ -52,12 +52,13 @@
25 self.ubuntu_one_page_tests()
26 else:
27 self.go_to_progress_page()
28-
29- self.progress_page_tests()
30+ #TODO Uncomment and return timout to 30 if made no difference
31+ # this is an attempt at a work around to avoid bug 1267116
32+ #self.progress_page_tests()
33 self.assertThat(lambda: self.app.select_single(
34 'GtkDialog',
35 name='finished_dialog').visible,
36- Eventually(Equals(True), timeout=30))
37+ Eventually(Equals(True), timeout=900))
38 #XXX: Uncomment if you want to restart after install complete
39 ## we need to sleep here to wait for dialog to fully load. It appears
40 ## in dbus before its actually visible. As the test has already passed
41
42=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py'
43--- autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py 2013-12-28 12:32:53 +0000
44+++ autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py 2014-02-07 17:27:15 +0000
45@@ -54,11 +54,13 @@
46 else:
47 self.go_to_progress_page()
48
49- self.progress_page_tests()
50+ #TODO Uncomment and return timout to 30 if made no difference
51+ # this is an attempt at a work around to avoid bug 1267116
52+ #self.progress_page_tests()
53 self.assertThat(lambda: self.app.select_single(
54 'GtkDialog',
55 name='finished_dialog').visible,
56- Eventually(Equals(True), timeout=30))
57+ Eventually(Equals(True), timeout=900))
58 #XXX: Uncomment if you want to restart after install complete
59 ## we need to sleep here to wait for dialog to fully load. It appears
60 ## in dbus before its actually visible. As the test has already passed
61
62=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py'
63--- autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py 2013-12-28 12:32:53 +0000
64+++ autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py 2014-02-07 17:27:15 +0000
65@@ -52,11 +52,13 @@
66 else:
67 self.go_to_progress_page()
68
69- self.progress_page_tests()
70+ #TODO Uncomment and return timout to 30 if made no difference
71+ # this is an attempt at a work around to avoid bug 1267116
72+ #self.progress_page_tests()
73 self.assertThat(lambda: self.app.select_single(
74 'GtkDialog',
75 name='finished_dialog').visible,
76- Eventually(Equals(True), timeout=30))
77+ Eventually(Equals(True), timeout=900))
78 #XXX: Uncomment if you want to restart after install complete
79 ## we need to sleep here to wait for dialog to fully load. It appears
80 ## in dbus before its actually visible. As the test has already passed
81
82=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py'
83--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py 2013-12-28 12:32:53 +0000
84+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py 2014-02-07 17:27:15 +0000
85@@ -53,11 +53,13 @@
86 else:
87 self.go_to_progress_page()
88
89- self.progress_page_tests()
90+ #TODO Uncomment and return timout to 30 if made no difference
91+ # this is an attempt at a work around to avoid bug 1267116
92+ #self.progress_page_tests()
93 self.assertThat(lambda: self.app.select_single(
94 'GtkDialog',
95 name='finished_dialog').visible,
96- Eventually(Equals(True), timeout=30))
97+ Eventually(Equals(True), timeout=900))
98 #XXX: Uncomment if you want to restart after install complete
99 ## we need to sleep here to wait for dialog to fully load. It appears
100 ## in dbus before its actually visible. As the test has already passed
101
102=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py'
103--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py 2013-12-28 12:32:53 +0000
104+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py 2014-02-07 17:27:15 +0000
105@@ -55,11 +55,13 @@
106 else:
107 self.go_to_progress_page()
108
109- self.progress_page_tests()
110+ #TODO Uncomment and return timout to 30 if made no difference
111+ # this is an attempt at a work around to avoid bug 1267116
112+ #self.progress_page_tests()
113 self.assertThat(lambda: self.app.select_single(
114 'GtkDialog',
115 name='finished_dialog').visible,
116- Eventually(Equals(True), timeout=30))
117+ Eventually(Equals(True), timeout=900))
118 #XXX: Uncomment if you want to restart after install complete
119 ## we need to sleep here to wait for dialog to fully load. It appears
120 ## in dbus before its actually visible. As the test has already passed
121
122=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py'
123--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py 2013-12-28 12:32:53 +0000
124+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py 2014-02-07 17:27:15 +0000
125@@ -52,11 +52,13 @@
126 else:
127 self.go_to_progress_page()
128
129- self.progress_page_tests()
130+ #TODO Uncomment and return timout to 30 if made no difference
131+ # this is an attempt at a work around to avoid bug 1267116
132+ #self.progress_page_tests()
133 self.assertThat(lambda: self.app.select_single(
134 'GtkDialog',
135 name='finished_dialog').visible,
136- Eventually(Equals(True), timeout=30))
137+ Eventually(Equals(True), timeout=900))
138 #XXX: Uncomment if you want to restart after install complete
139 ## we need to sleep here to wait for dialog to fully load. It appears
140 ## in dbus before its actually visible. As the test has already passed

Subscribers

People subscribed via source and target branches

to status/vote changes: