diff options
author | Jair Gonzalez <jair.de.jesus.gonzalez.plascencia@linux.intel.com> | 2016-12-16 16:12:55 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-22 08:50:17 +0000 |
commit | 285c2ed90e8056999c40df9cce3035e92cd7f9b4 (patch) | |
tree | fe109848108bf97b8f9fd27cb76a1215be74d1d2 /meta | |
parent | c48c0f38b1726378d6761225ab0a4ceca7492588 (diff) | |
download | poky-285c2ed90e8056999c40df9cce3035e92cd7f9b4.tar.gz |
selftest/wic: code cleanup
The following changes were added to improve the code readability:
- Removed redundant backlashes between brackets
- Aligned continuation lines according to PEP8 style
- Refactored command execution in the next methods for enhanced
legibility:
- test_build_image_name(self)
- test_gpt_image(self)
- test_qemux86_directdisk(self)
- test_rootfs_indirect_recipes(self)
- test_iso_image(self)
- test_mkgummidisk(self)
- test_mkefidisk(self)
- test_directdisk_bootloader_config(self)
- test_qemu(self)
- test_bmap(self)
- test_systemd_bootdisk(self)
- test_sdimage_bootpart(self)
(From OE-Core rev: 5ba21836fe3c061a6271f855a9e26c66004d330a)
Signed-off-by: Jair Gonzalez <jair.de.jesus.gonzalez.plascencia@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 107 |
1 files changed, 48 insertions, 59 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 8c7aefa19c..d130ba2658 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py | |||
@@ -74,16 +74,16 @@ class Wic(oeSelfTest): | |||
74 | @testcase(1211) | 74 | @testcase(1211) |
75 | def test_build_image_name(self): | 75 | def test_build_image_name(self): |
76 | """Test wic create directdisk --image-name core-image-minimal""" | 76 | """Test wic create directdisk --image-name core-image-minimal""" |
77 | self.assertEqual(0, runCmd("wic create directdisk " | 77 | cmd = "wic create directdisk --image-name core-image-minimal" |
78 | "--image-name core-image-minimal").status) | 78 | self.assertEqual(0, runCmd(cmd).status) |
79 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) | 79 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) |
80 | 80 | ||
81 | @testcase(1212) | 81 | @testcase(1212) |
82 | def test_build_artifacts(self): | 82 | def test_build_artifacts(self): |
83 | """Test wic create directdisk providing all artifacts.""" | 83 | """Test wic create directdisk providing all artifacts.""" |
84 | bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \ | 84 | bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) |
85 | for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', | 85 | for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', |
86 | 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) | 86 | 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) |
87 | status = runCmd("wic create directdisk " | 87 | status = runCmd("wic create directdisk " |
88 | "-b %(staging_datadir)s " | 88 | "-b %(staging_datadir)s " |
89 | "-k %(deploy_dir_image)s " | 89 | "-k %(deploy_dir_image)s " |
@@ -95,8 +95,8 @@ class Wic(oeSelfTest): | |||
95 | @testcase(1157) | 95 | @testcase(1157) |
96 | def test_gpt_image(self): | 96 | def test_gpt_image(self): |
97 | """Test creation of core-image-minimal with gpt table and UUID boot""" | 97 | """Test creation of core-image-minimal with gpt table and UUID boot""" |
98 | self.assertEqual(0, runCmd("wic create directdisk-gpt " | 98 | cmd = "wic create directdisk-gpt --image-name core-image-minimal" |
99 | "--image-name core-image-minimal").status) | 99 | self.assertEqual(0, runCmd(cmd).status) |
100 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) | 100 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) |
101 | 101 | ||
102 | @testcase(1213) | 102 | @testcase(1213) |
@@ -131,8 +131,7 @@ class Wic(oeSelfTest): | |||
131 | self.assertEqual(0, runCmd("wic create directdisk " | 131 | self.assertEqual(0, runCmd("wic create directdisk " |
132 | "--image-name core-image-minimal " | 132 | "--image-name core-image-minimal " |
133 | "-c gzip").status) | 133 | "-c gzip").status) |
134 | self.assertEqual(1, len(glob(self.resultdir + \ | 134 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct.gz"))) |
135 | "directdisk-*.direct.gz"))) | ||
136 | 135 | ||
137 | @testcase(1265) | 136 | @testcase(1265) |
138 | def test_compress_bzip2(self): | 137 | def test_compress_bzip2(self): |
@@ -140,8 +139,7 @@ class Wic(oeSelfTest): | |||
140 | self.assertEqual(0, runCmd("wic create directdisk " | 139 | self.assertEqual(0, runCmd("wic create directdisk " |
141 | "--image-name core-image-minimal " | 140 | "--image-name core-image-minimal " |
142 | "-c bzip2").status) | 141 | "-c bzip2").status) |
143 | self.assertEqual(1, len(glob(self.resultdir + \ | 142 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct.bz2"))) |
144 | "directdisk-*.direct.bz2"))) | ||
145 | 143 | ||
146 | @testcase(1266) | 144 | @testcase(1266) |
147 | def test_compress_xz(self): | 145 | def test_compress_xz(self): |
@@ -149,8 +147,7 @@ class Wic(oeSelfTest): | |||
149 | self.assertEqual(0, runCmd("wic create directdisk " | 147 | self.assertEqual(0, runCmd("wic create directdisk " |
150 | "--image-name core-image-minimal " | 148 | "--image-name core-image-minimal " |
151 | "-c xz").status) | 149 | "-c xz").status) |
152 | self.assertEqual(1, len(glob(self.resultdir + \ | 150 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct.xz"))) |
153 | "directdisk-*.direct.xz"))) | ||
154 | 151 | ||
155 | @testcase(1267) | 152 | @testcase(1267) |
156 | def test_wrong_compressor(self): | 153 | def test_wrong_compressor(self): |
@@ -162,37 +159,35 @@ class Wic(oeSelfTest): | |||
162 | @testcase(1268) | 159 | @testcase(1268) |
163 | def test_rootfs_indirect_recipes(self): | 160 | def test_rootfs_indirect_recipes(self): |
164 | """Test usage of rootfs plugin with rootfs recipes""" | 161 | """Test usage of rootfs plugin with rootfs recipes""" |
165 | wks = "directdisk-multi-rootfs" | 162 | status = runCmd("wic create directdisk-multi-rootfs " |
166 | self.assertEqual(0, runCmd("wic create %s " | 163 | "--image-name core-image-minimal " |
167 | "--image-name core-image-minimal " | 164 | "--rootfs rootfs1=core-image-minimal " |
168 | "--rootfs rootfs1=core-image-minimal " | 165 | "--rootfs rootfs2=core-image-minimal").status |
169 | "--rootfs rootfs2=core-image-minimal" \ | 166 | self.assertEqual(0, status) |
170 | % wks).status) | 167 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-multi-rootfs*.direct"))) |
171 | self.assertEqual(1, len(glob(self.resultdir + "%s*.direct" % wks))) | ||
172 | 168 | ||
173 | @testcase(1269) | 169 | @testcase(1269) |
174 | def test_rootfs_artifacts(self): | 170 | def test_rootfs_artifacts(self): |
175 | """Test usage of rootfs plugin with rootfs paths""" | 171 | """Test usage of rootfs plugin with rootfs paths""" |
176 | bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \ | 172 | bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) |
177 | for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', | 173 | for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', |
178 | 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) | 174 | 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS')) |
179 | bbvars['wks'] = "directdisk-multi-rootfs" | 175 | bbvars['wks'] = "directdisk-multi-rootfs" |
180 | status = runCmd("wic create %(wks)s " | 176 | status = runCmd("wic create %(wks)s " |
181 | "-b %(staging_datadir)s " | 177 | "-b %(staging_datadir)s " |
182 | "-k %(deploy_dir_image)s " | 178 | "-k %(deploy_dir_image)s " |
183 | "-n %(staging_dir_native)s " | 179 | "-n %(staging_dir_native)s " |
184 | "--rootfs-dir rootfs1=%(image_rootfs)s " | 180 | "--rootfs-dir rootfs1=%(image_rootfs)s " |
185 | "--rootfs-dir rootfs2=%(image_rootfs)s" \ | 181 | "--rootfs-dir rootfs2=%(image_rootfs)s" |
186 | % bbvars).status | 182 | % bbvars).status |
187 | self.assertEqual(0, status) | 183 | self.assertEqual(0, status) |
188 | self.assertEqual(1, len(glob(self.resultdir + \ | 184 | self.assertEqual(1, len(glob(self.resultdir + "%(wks)s-*.direct" % bbvars))) |
189 | "%(wks)s-*.direct" % bbvars))) | ||
190 | 185 | ||
191 | @testcase(1346) | 186 | @testcase(1346) |
192 | def test_iso_image(self): | 187 | def test_iso_image(self): |
193 | """Test creation of hybrid iso image with legacy and EFI boot""" | 188 | """Test creation of hybrid iso image with legacy and EFI boot""" |
194 | self.assertEqual(0, runCmd("wic create mkhybridiso " | 189 | cmd = "wic create mkhybridiso --image-name core-image-minimal" |
195 | "--image-name core-image-minimal").status) | 190 | self.assertEqual(0, runCmd(cmd).status) |
196 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct"))) | 191 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct"))) |
197 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso"))) | 192 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso"))) |
198 | 193 | ||
@@ -238,34 +233,30 @@ class Wic(oeSelfTest): | |||
238 | @testcase(1348) | 233 | @testcase(1348) |
239 | def test_qemux86_directdisk(self): | 234 | def test_qemux86_directdisk(self): |
240 | """Test creation of qemux-86-directdisk image""" | 235 | """Test creation of qemux-86-directdisk image""" |
241 | image = "qemux86-directdisk" | 236 | cmd = "wic create qemux86-directdisk -e core-image-minimal" |
242 | self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ | 237 | self.assertEqual(0, runCmd(cmd).status) |
243 | % image).status) | 238 | self.assertEqual(1, len(glob(self.resultdir + "qemux86-directdisk-*direct"))) |
244 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | ||
245 | 239 | ||
246 | @testcase(1349) | 240 | @testcase(1349) |
247 | def test_mkgummidisk(self): | 241 | def test_mkgummidisk(self): |
248 | """Test creation of mkgummidisk image""" | 242 | """Test creation of mkgummidisk image""" |
249 | image = "mkgummidisk" | 243 | cmd = "wic create mkgummidisk --image-name core-image-minimal" |
250 | self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ | 244 | self.assertEqual(0, runCmd(cmd).status) |
251 | % image).status) | 245 | self.assertEqual(1, len(glob(self.resultdir + "mkgummidisk-*direct"))) |
252 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | ||
253 | 246 | ||
254 | @testcase(1350) | 247 | @testcase(1350) |
255 | def test_mkefidisk(self): | 248 | def test_mkefidisk(self): |
256 | """Test creation of mkefidisk image""" | 249 | """Test creation of mkefidisk image""" |
257 | image = "mkefidisk" | 250 | cmd = "wic create mkefidisk -e core-image-minimal" |
258 | self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ | 251 | self.assertEqual(0, runCmd(cmd).status) |
259 | % image).status) | 252 | self.assertEqual(1, len(glob(self.resultdir + "mkefidisk-*direct"))) |
260 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | ||
261 | 253 | ||
262 | @testcase(1385) | 254 | @testcase(1385) |
263 | def test_directdisk_bootloader_config(self): | 255 | def test_directdisk_bootloader_config(self): |
264 | """Test creation of directdisk-bootloader-config image""" | 256 | """Test creation of directdisk-bootloader-config image""" |
265 | image = "directdisk-bootloader-config" | 257 | cmd = "wic create directdisk-bootloader-config -e core-image-minimal" |
266 | self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ | 258 | self.assertEqual(0, runCmd(cmd).status) |
267 | % image).status) | 259 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-bootloader-config-*direct"))) |
268 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | ||
269 | 260 | ||
270 | @testcase(1422) | 261 | @testcase(1422) |
271 | def test_qemu(self): | 262 | def test_qemu(self): |
@@ -273,33 +264,31 @@ class Wic(oeSelfTest): | |||
273 | self.assertEqual(0, bitbake('wic-image-minimal').status) | 264 | self.assertEqual(0, bitbake('wic-image-minimal').status) |
274 | 265 | ||
275 | with runqemu('wic-image-minimal', ssh=False) as qemu: | 266 | with runqemu('wic-image-minimal', ssh=False) as qemu: |
276 | command = "mount |grep '^/dev/' | cut -f1,3 -d ' '" | 267 | cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" |
277 | status, output = qemu.run_serial(command) | 268 | status, output = qemu.run_serial(cmd) |
278 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (command, output)) | 269 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) |
279 | self.assertEqual(output, '/dev/root /\r\n/dev/vda3 /mnt') | 270 | self.assertEqual(output, '/dev/root /\r\n/dev/vda3 /mnt') |
280 | 271 | ||
281 | @testcase(1496) | 272 | @testcase(1496) |
282 | def test_bmap(self): | 273 | def test_bmap(self): |
283 | """Test generation of .bmap file""" | 274 | """Test generation of .bmap file""" |
284 | image = "directdisk" | 275 | cmd = "wic create directdisk -e core-image-minimal --bmap" |
285 | status = runCmd("wic create %s -e core-image-minimal --bmap" % image).status | 276 | status = runCmd(cmd).status |
286 | self.assertEqual(0, status) | 277 | self.assertEqual(0, status) |
287 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | 278 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*direct"))) |
288 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct.bmap" % image))) | 279 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*direct.bmap"))) |
289 | 280 | ||
290 | @testcase(1560) | 281 | @testcase(1560) |
291 | def test_systemd_bootdisk(self): | 282 | def test_systemd_bootdisk(self): |
292 | """Test creation of systemd-bootdisk image""" | 283 | """Test creation of systemd-bootdisk image""" |
293 | image = "systemd-bootdisk" | 284 | cmd = "wic create systemd-bootdisk -e core-image-minimal" |
294 | self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ | 285 | self.assertEqual(0, runCmd(cmd).status) |
295 | % image).status) | 286 | self.assertEqual(1, len(glob(self.resultdir + "systemd-bootdisk-*direct"))) |
296 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | ||
297 | 287 | ||
298 | @testcase(1561) | 288 | @testcase(1561) |
299 | def test_sdimage_bootpart(self): | 289 | def test_sdimage_bootpart(self): |
300 | """Test creation of sdimage-bootpart image""" | 290 | """Test creation of sdimage-bootpart image""" |
301 | image = "sdimage-bootpart" | 291 | cmd = "wic create sdimage-bootpart -e core-image-minimal" |
302 | self.write_config('IMAGE_BOOT_FILES = "bzImage"\n') | 292 | self.write_config('IMAGE_BOOT_FILES = "bzImage"\n') |
303 | self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ | 293 | self.assertEqual(0, runCmd(cmd).status) |
304 | % image).status) | 294 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) |
305 | self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) | ||