[oe-commits] [openembedded-core] 15/34: cases/bbtests.py: test_bitbake_g(): Check base-files rather than busybox

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit f73676b07f6d8a4573a5f46c3e082831b34b7d18
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Sep 25 11:18:34 2019 +0800

    cases/bbtests.py: test_bitbake_g(): Check base-files rather than busybox
    
    It checked whether busybox is in task-depends.dot after run "bitbake -g
    core-image-minimal", but busybox is not a must for core-image-minimal since it
    is configurable:
    
    VIRTUAL-RUNTIME_base-utils = ""
    VIRTUAL-RUNTIME_base-utils-syslog = ""
    VIRTUAL-RUNTIME_base-utils-hwclock  =  ""
    VIRTUAL-RUNTIME_login_manager = "shadow"
    VIRTUAL-RUNTIME_syslog = ""
    
    So the case may fail when busybox is not present, check
    base-files which is more reliable.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index 8e59baf..9461c7e 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -118,11 +118,12 @@ class BitbakeTests(OESelftestTestCase):
             self.assertIn(task, result.output, msg="Couldn't find %s task.")
 
     def test_bitbake_g(self):
-        result = bitbake('-g core-image-minimal')
+        recipe = 'base-files'
+        result = bitbake('-g %s' % recipe)
         for f in ['pn-buildlist', 'task-depends.dot']:
             self.addCleanup(os.remove, f)
         self.assertTrue('Task dependencies saved to \'task-depends.dot\'' in result.output, msg = "No task dependency \"task-depends.dot\" file was generated for the given task target. bitbake output: %s" % result.output)
-        self.assertTrue('busybox' in ftools.read_file(os.path.join(self.builddir, 'task-depends.dot')), msg = "No \"busybox\" dependency found in task-depends.dot file.")
+        self.assertTrue(recipe in ftools.read_file(os.path.join(self.builddir, 'task-depends.dot')), msg = "No \"%s\" dependency found in task-depends.dot file." % recipe)
 
     def test_image_manifest(self):
         bitbake('core-image-minimal')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.