From c1be1161cf555727aa56ee2109ee77f420f67c9f Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 24 Jan 2017 15:43:56 +0200 Subject: 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. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'meta/lib') 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 class Wic(oeSelfTest): """Wic test class.""" - alternate_resultdir = "/var/tmp/wic/build/alt/" resultdir = "/var/tmp/wic.oe-selftest/" image_is_ready = False wicenv_cache = {} @@ -202,20 +201,13 @@ class Wic(oeSelfTest): self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) @testcase(1562) - def test_alternate_output_dir(self): - """Test alternate output directory""" - self.assertEqual(0, runCmd("wic create directdisk " - "-e core-image-minimal " - "-o %s" - % self.alternate_resultdir).status) - self.assertEqual(1, len(glob(self.alternate_resultdir + - "build/directdisk-*.direct"))) - self.assertEqual(0, runCmd("wic create mkefidisk -e " - "core-image-minimal " - "--outdir=%s" - % self.alternate_resultdir).status) - self.assertEqual(1, len(glob(self.alternate_resultdir + - "build/mkefidisk-*direct"))) + def test_default_output_dir(self): + """Test default output location""" + for fname in glob("directdisk-*.direct"): + os.remove(fname) + cmd = "wic create directdisk -e core-image-minimal" + self.assertEqual(0, runCmd(cmd).status) + self.assertEqual(1, len(glob("directdisk-*.direct"))) @testcase(1212) def test_build_artifacts(self): -- cgit 1.2.3-korg