summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-24 15:43:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:38:32 +0000
commit3d585a518c7e7490486f31633d61377081ec0155 (patch)
tree6aa253f43821571c4e83a57cdf6e2213eed6c338 /meta/lib
parent3f21101e727c605443f06d5d2ec6a3413b4fd338 (diff)
downloadpoky-3d585a518c7e7490486f31633d61377081ec0155.tar.gz
selftest: wic: test default output directory
As tests now explicitly specify output directory we don't need test_alternate_output_dir test case. However, we need to test wic output to default output location. Removed test_alternate_output_dir test case. Added test_default_output_dir test case. (From OE-Core rev: c1be1161cf555727aa56ee2109ee77f420f67c9f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/wic.py22
1 files changed, 7 insertions, 15 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 355a69ca1c..0a78659bb1 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -36,7 +36,6 @@ from oeqa.utils.decorators import testcase
36class Wic(oeSelfTest): 36class Wic(oeSelfTest):
37 """Wic test class.""" 37 """Wic test class."""
38 38
39 alternate_resultdir = "/var/tmp/wic/build/alt/"
40 resultdir = "/var/tmp/wic.oe-selftest/" 39 resultdir = "/var/tmp/wic.oe-selftest/"
41 image_is_ready = False 40 image_is_ready = False
42 wicenv_cache = {} 41 wicenv_cache = {}
@@ -202,20 +201,13 @@ class Wic(oeSelfTest):
202 self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) 201 self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct")))
203 202
204 @testcase(1562) 203 @testcase(1562)
205 def test_alternate_output_dir(self): 204 def test_default_output_dir(self):
206 """Test alternate output directory""" 205 """Test default output location"""
207 self.assertEqual(0, runCmd("wic create directdisk " 206 for fname in glob("directdisk-*.direct"):
208 "-e core-image-minimal " 207 os.remove(fname)
209 "-o %s" 208 cmd = "wic create directdisk -e core-image-minimal"
210 % self.alternate_resultdir).status) 209 self.assertEqual(0, runCmd(cmd).status)
211 self.assertEqual(1, len(glob(self.alternate_resultdir + 210 self.assertEqual(1, len(glob("directdisk-*.direct")))
212 "build/directdisk-*.direct")))
213 self.assertEqual(0, runCmd("wic create mkefidisk -e "
214 "core-image-minimal "
215 "--outdir=%s"
216 % self.alternate_resultdir).status)
217 self.assertEqual(1, len(glob(self.alternate_resultdir +
218 "build/mkefidisk-*direct")))
219 211
220 @testcase(1212) 212 @testcase(1212)
221 def test_build_artifacts(self): 213 def test_build_artifacts(self):