summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorBill Randle <william.c.randle@intel.com>2016-04-13 10:17:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:28:21 +0100
commit8beb671843f1f8b6613e286c17e746f64c33ffa5 (patch)
tree5aac97730679d98e6a2cc8dc6ea20e96aada638c /meta/lib/oeqa
parent0262bc51cdad5e88b14bdce634fe08ab4401de8b (diff)
downloadpoky-8beb671843f1f8b6613e286c17e746f64c33ffa5.tar.gz
ext-sdk-prepare.py: exclude do_rm_work from unexpected output; create unit test
When installing the esdk with INHERIT += "rm_work", the script complains about do_rm_work as unexpected output from the bitbake run. This patch ignores any output lines with do_rm_work and further refactors the output comparison into its own function creates a new unit test to verify the fix. The unit test can be run direct from the command line or via oe-selftest. [YOCTO #9019] (From OE-Core rev: d41930e1daa933cf4bf063fa79a2e8fc9129e1b1) Signed-off-by: Bill Randle <william.c.randle@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rwxr-xr-xmeta/lib/oeqa/selftest/esdk_prepare.py75
1 files changed, 75 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/esdk_prepare.py b/meta/lib/oeqa/selftest/esdk_prepare.py
new file mode 100755
index 0000000000..1b36a0d682
--- /dev/null
+++ b/meta/lib/oeqa/selftest/esdk_prepare.py
@@ -0,0 +1,75 @@
1#!/usr/bin/env python
2
3import shutil, tempfile
4import sys
5import os
6import imp
7import unittest
8try:
9 from oeqa.utils.commands import get_bb_var
10except ImportError:
11 pass
12
13# module under test
14module_file_name = "ext-sdk-prepare.py"
15module_path = ""
16
17class ExtSdkPrepareTest(unittest.TestCase):
18
19 """ unit test for fix for Yocto #9019 """
20
21 @classmethod
22 def setUpClass(self):
23 # copy module under test to temp dir
24 self.test_dir = tempfile.mkdtemp()
25 module_dest_path = os.path.join(self.test_dir, module_file_name)
26 try:
27 shutil.copy(module_path, self.test_dir)
28 # load module under test
29 self.test_mod = imp.load_source("", module_dest_path)
30 except:
31 print "error: unable to copy or load %s [src: %s, dst: %s]" % \
32 (module_file_name, module_path, module_dest_path)
33 sys.exit(1)
34
35 def test_prepare_unexpected(self):
36 # test data
37 # note: pathnames have been truncated from the actual bitbake
38 # output as they are not important for the test.
39 test_data = (
40 'NOTE: Running noexec task 9 of 6539 (ID: 28, quilt/quilt-native_0.64.bb, do_build)\n'
41 'NOTE: Running task 10 of 6539 (ID: 29, quilt/quilt-native_0.64.bb, do_package)\n'
42 'NOTE: Running task 11 of 6539 (ID: 30, quilt/quilt-native_0.64.bb, do_rm_work)\n'
43 'NOTE: Running noexec task 6402 of 6539 (ID: 1, images/core-image-sato.bb, do_patch)\n'
44 'NOTE: Running task 6538 of 6539 (ID: 14, images/core-image-sato.bb, do_rm_work)\n'
45 )
46 # expected warning output
47 expected = [ (' task 10 of 6539 (ID: 29, quilt/quilt-native_0.64.bb, do_package)') ]
48 # recipe to test, matching test input data
49 recipes = [ "core-image-sato.bb" ]
50
51 # run the test
52 output = self.test_mod.check_unexpected(test_data, recipes)
53 self.assertEqual(output, expected)
54
55 @classmethod
56 def tearDownClass(self):
57 # remove temp dir
58 shutil.rmtree(self.test_dir)
59
60if __name__ == '__main__':
61 # running from command line - i.e., not under oe-selftest
62 # directory containing module under test comes from command line
63 if len(sys.argv) == 2 and os.path.isdir(sys.argv[1]):
64 module_path = os.path.join(sys.argv[1], module_file_name)
65 suite = unittest.TestLoader().loadTestsFromTestCase(ExtSdkPrepareTest)
66 unittest.TextTestRunner().run(suite)
67 else:
68 progname = os.path.basename(sys.argv[0])
69 print "%s: missing directory path" % progname
70 print "usage: %s /path/to/directory-of(ext-sdk-prepare.py)" % progname
71 sys.exit(1)
72else:
73 # running under oe-selftest
74 # determine module source dir from COREBASE and expected path
75 module_path = os.path.join(get_bb_var("COREBASE"), "meta", "files", module_file_name)