Merge lp:~bladernr/checkbox/1014813-removable-storage-root-perms into lp:checkbox

Proposed by Jeff Lane 
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 1822
Merged at revision: 1823
Proposed branch: lp:~bladernr/checkbox/1014813-removable-storage-root-perms
Merge into: lp:checkbox
Diff against target: 204 lines (+24/-0)
5 files modified
debian/changelog (+2/-0)
jobs/esata.txt.in (+1/-0)
jobs/firewire.txt.in (+1/-0)
jobs/mediacard.txt.in (+16/-0)
jobs/usb.txt.in (+4/-0)
To merge this branch: bzr merge lp:~bladernr/checkbox/1014813-removable-storage-root-perms
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Jeff Lane  Needs Resubmitting
Sylvain Pineau (community) Approve
Review via email: mp+131479@code.launchpad.net

Description of the change

Several instances of tests using removable_storage_test failed because of lack of root level permissions. Some of the jobs that use removable_storage_test already had 'user: root' specified. I've gone through and made all the remaining removable_storage_test jobs do the same.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in debian/changelog

Revision history for this message
Jeff Lane  (bladernr) wrote :

Resolved a changelog conflict

review: Needs Resubmitting
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Approved

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in debian/changelog

Revision history for this message
Jeff Lane  (bladernr) wrote :

I'm just going to stop updating the changelog... >:(

1822. By Jeff Lane 

Fix changelog ... again.

Revision history for this message
Jeff Lane  (bladernr) wrote :

I fixed this EXACT SAME changelog conflict already. Then I pushed that and it conflicted again... it is now fixed, again.

review: Needs Resubmitting
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

In such case just accept yourself, we'll be happier :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-13 08:35:25 +0000
3+++ debian/changelog 2012-11-13 14:39:25 +0000
4@@ -143,6 +143,8 @@
5 real benefit and fails about 100% of the time. (LP: #764376)
6 * scrips/volume_test - script now only fails if volume is greater than maxvol or
7 less than minvol, not when equal to either. (LP: #1077008)
8+ * Added root user requirement to all jobs using removable storage test
9+ (LP: #1014813)
10
11 -- Jeff Lane <jeff@ubuntu.com> Wed, 07 Nov 2012 17:33:46 -0500
12
13
14=== modified file 'jobs/esata.txt.in'
15--- jobs/esata.txt.in 2012-10-27 10:33:23 +0000
16+++ jobs/esata.txt.in 2012-11-13 14:39:25 +0000
17@@ -14,6 +14,7 @@
18
19 plugin: shell
20 name: esata/storage-test
21+user: root
22 depends: esata/insert
23 command: removable_storage_test ata_serial_esata
24 _description:
25
26=== modified file 'jobs/firewire.txt.in'
27--- jobs/firewire.txt.in 2012-10-27 10:33:23 +0000
28+++ jobs/firewire.txt.in 2012-11-13 14:39:25 +0000
29@@ -14,6 +14,7 @@
30
31 plugin: shell
32 name: firewire/storage-test
33+user: root
34 depends: firewire/insert
35 command: removable_storage_test firewire
36 _description:
37
38=== modified file 'jobs/mediacard.txt.in'
39--- jobs/mediacard.txt.in 2012-10-27 10:33:23 +0000
40+++ jobs/mediacard.txt.in 2012-11-13 14:39:25 +0000
41@@ -16,6 +16,7 @@
42 plugin: shell
43 name: mediacard/mmc-storage
44 depends: mediacard/mmc-insert
45+user: root
46 command: removable_storage_test --memorycard sdio usb scsi
47 _description:
48 This test is automated and executes after the mediacard/mmc-insert
49@@ -55,6 +56,7 @@
50 plugin: shell
51 name: mediacard/mmc-storage-after-suspend
52 depends: mediacard/mmc-insert-after-suspend
53+user: root
54 command: removable_storage_test --memorycard sdio usb scsi
55 _description:
56 This test is automated and executes after the mediacard/mmc-insert-after-suspend test
57@@ -93,6 +95,7 @@
58 plugin: shell
59 name: mediacard/sd-storage
60 depends: mediacard/sd-insert
61+user: root
62 command: removable_storage_test --memorycard sdio usb scsi
63 _description:
64 This test is automated and executes after the mediacard/sd-insert
65@@ -132,6 +135,7 @@
66 plugin: shell
67 name: mediacard/sd-storage-after-suspend
68 depends: mediacard/sd-insert-after-suspend
69+user: root
70 command: removable_storage_test --memorycard sdio usb scsi
71 _description:
72 This test is automated and executes after the mediacard/sd-insert-after-suspend test
73@@ -180,6 +184,7 @@
74 plugin: shell
75 name: mediacard/sdhc-storage
76 depends: mediacard/sdhc-insert
77+user: root
78 command: removable_storage_test --memorycard sdio usb scsi
79 _description:
80 This test is automated and executes after the mediacard/sdhc-insert
81@@ -219,6 +224,7 @@
82 plugin: shell
83 name: mediacard/sdhc-storage-after-suspend
84 depends: mediacard/sdhc-insert-after-suspend
85+user: root
86 command: removable_storage_test --memorycard sdio usb scsi
87 _description:
88 This test is automated and executes after the mediacard/sdhc-insert-after-suspend test
89@@ -257,6 +263,7 @@
90 plugin: shell
91 name: mediacard/cf-storage
92 depends: mediacard/cf-insert
93+user: root
94 command: removable_storage_test --memorycard sdio usb scsi
95 _description:
96 This test is automated and executes after the mediacard/cf-insert
97@@ -296,6 +303,7 @@
98 plugin: shell
99 name: mediacard/cf-storage-after-suspend
100 depends: mediacard/cf-insert-after-suspend
101+user: root
102 command: removable_storage_test --memorycard sdio usb scsi
103 _description:
104 This test is automated and executes after the mediacard/cf-insert-after-suspend test
105@@ -334,6 +342,7 @@
106 plugin: shell
107 name: mediacard/sdxc-storage
108 depends: mediacard/sdxc-insert
109+user: root
110 command: removable_storage_test --memorycard sdio usb scsi
111 _description:
112 This test is automated and executes after the mediacard/sdxc-insert
113@@ -373,6 +382,7 @@
114 plugin: shell
115 name: mediacard/sdxc-storage-after-suspend
116 depends: mediacard/sdxc-insert-after-suspend
117+user: root
118 command: removable_storage_test --memorycard sdio usb scsi
119 _description:
120 This test is automated and executes after the mediacard/sdxc-insert-after-suspend test
121@@ -411,6 +421,7 @@
122 plugin: shell
123 name: mediacard/ms-storage
124 depends: mediacard/ms-insert
125+user: root
126 command: removable_storage_test --memorycard sdio usb scsi
127 _description:
128 This test is automated and executes after the mediacard/ms-insert
129@@ -450,6 +461,7 @@
130 plugin: shell
131 name: mediacard/ms-storage-after-suspend
132 depends: mediacard/ms-insert-after-suspend
133+user: root
134 command: removable_storage_test --memorycard sdio usb scsi
135 _description:
136 This test is automated and executes after the mediacard/ms-insert-after-suspend test
137@@ -488,6 +500,7 @@
138 plugin: shell
139 name: mediacard/msp-storage
140 depends: mediacard/msp-insert
141+user: root
142 command: removable_storage_test --memorycard sdio usb scsi
143 _description:
144 This test is automated and executes after the mediacard/msp-insert
145@@ -527,6 +540,7 @@
146 plugin: shell
147 name: mediacard/msp-storage-after-suspend
148 depends: mediacard/msp-insert-after-suspend
149+user: root
150 command: removable_storage_test --memorycard sdio usb scsi
151 _description:
152 This test is automated and executes after the mediacard/msp-insert-after-suspend test
153@@ -565,6 +579,7 @@
154 plugin: shell
155 name: mediacard/xd-storage
156 depends: mediacard/xd-insert
157+user: root
158 command: removable_storage_test --memorycard sdio usb scsi
159 _description:
160 This test is automated and executes after the mediacard/xd-insert
161@@ -604,6 +619,7 @@
162 plugin: shell
163 name: mediacard/xd-storage-after-suspend
164 depends: mediacard/xd-insert-after-suspend
165+user: root
166 command: removable_storage_test --memorycard sdio usb scsi
167 _description:
168 This test is automated and executes after the mediacard/xd-insert-after-suspend test
169
170=== modified file 'jobs/usb.txt.in'
171--- jobs/usb.txt.in 2012-10-29 21:43:57 +0000
172+++ jobs/usb.txt.in 2012-11-13 14:39:25 +0000
173@@ -100,6 +100,7 @@
174 plugin: manual
175 name: usb/storage-transfer
176 depends: usb/insert
177+user: root
178 command: removable_storage_test usb
179 _description:
180 PURPOSE:
181@@ -117,6 +118,7 @@
182 requires:
183 usb.usb3 == 'supported'
184 depends: usb3/insert
185+user: root
186 command: removable_storage_test -m 500000000 -p 7 usb
187 _description:
188 PURPOSE:
189@@ -132,6 +134,7 @@
190 plugin: shell
191 name: usb/storage-automated
192 depends: usb/insert
193+user: root
194 command: removable_storage_test usb
195 _description:
196 This test is automated and executes after the usb/insert test is run.
197@@ -141,6 +144,7 @@
198 requires:
199 usb.usb3 == 'supported'
200 depends: usb3/insert
201+user: root
202 command: removable_storage_test -m 500000000 -p 7 usb
203 _description:
204 This test is automated and executes after the usb3/insert test is run.

Subscribers

People subscribed via source and target branches