Skip to contentSkip to conversation

cases/bbtests.py: test_bitbake_g(): Check core-image-minimal itself

PATCH In review Robert Yang 2 participants 6 messages Sep 24, 2019 – Sep 25, 2019

lore
Share & tools
lore
#0 lore raw

cover cases/bbtests.py: test_bitbake_g(): Check core-image-minimal itself

The following changes since commit 95ad5626296380358c8a502a3e04879dab653d78:

build-appliance-image: Update to master head revision (2019-09-19 20:32:47 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/test
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/test

Robert Yang (1):
cases/bbtests.py: test_bitbake_g(): Check core-image-minimal itself

 meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 cases/bbtests.py: test_bitbake_g(): Check core-image-minimal itself

It checked whether busybox is in pn-buildlist and task-depends.dot after run "bitbake -g core-image-minimal", but busybox is not a must for core-image-minimal, so the case may fail when busybox is not present, this case is used for checking "bitbake -g", so check core-image-minimal itself is more reliable.

---
 meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/cases/bbtests.py +3 -2
index 8e59baf..4103396 100644
@@ -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 = 'core-image-minimal'
+        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')
Signature · 1 line
2.7.4
#2 lore raw
Quoted 3 lines · Robert Yang

It checked whether busybox is in pn-buildlist and task-depends.dot after run "bitbake -g core-image-minimal", but busybox is not a must for core-image-minimal,

You should explain why busybox is not a must since usually busybox is the key package in c-i-m.

We have some images that deliberately exclude busybox and
I think this was found by using:
echo "BB_NO_NETWORK = \"0\"" >> conf/local.conf
echo "PNWHITELIST_LAYERS_remove = \"selftest\"" >> conf/local.conf echo "SANITY_TESTED_DISTROS = \"\"" >> conf/local.conf
echo "DISTRO = \"wrlinux-graphics\"" >> conf/local.conf
echo "VIRTUAL-RUNTIME_no-busybox_forcevariable = \"\"" >> conf/local.conf echo "PNWHITELIST_meta-layer0 += 'layerappendtest'" >> conf/local.conf

so mention that in general and VIRTUAL-RUNTIME_no-busybox_forcevariable specifically.

Quoted 3 lines

so the case may fail when busybox is not present, this case
is used for checking "bitbake -g", so check core-image-minimal itself is more reliable.

It's true that busybox may not be present but we want to test that some package is in the image, not just that the task-depends.dot file exists and mentions c-i-m. How about searching for 'base-files' ?

../Randy

Quoted 26 lines
---
  meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/cases/bbtests.py +3 -2
index 8e59baf..4103396 100644
@@ -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 = 'core-image-minimal'
+        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')
Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#3 lore raw

Hi Randy,

Quoted 17 lines · Randy MacLeod
Quoted 3 lines · Robert Yang

It checked whether busybox is in pn-buildlist and task-depends.dot after run "bitbake -g core-image-minimal", but busybox is not a must for core-image-minimal,

You should explain why busybox is not a must since usually busybox is the key package in c-i-m.

We have some images that deliberately exclude busybox and
I think this was found by using:
echo "BB_NO_NETWORK = \"0\"" >> conf/local.conf
echo "PNWHITELIST_LAYERS_remove = \"selftest\"" >> conf/local.conf echo "SANITY_TESTED_DISTROS = \"\"" >> conf/local.conf
echo "DISTRO = \"wrlinux-graphics\"" >> conf/local.conf
echo "VIRTUAL-RUNTIME_no-busybox_forcevariable = \"\"" >> conf/local.conf echo "PNWHITELIST_meta-layer0 += 'layerappendtest'" >> conf/local.conf

Quoted 2 lines

so mention that in general and VIRTUAL-RUNTIME_no-busybox_forcevariable specifically.

Thanks for the explanation, I think that the maintainers know busybox is not a must in oe-core, not matter for core-image-minimal or sato, so I didn't add very detailed explanations.

Quoted 9 lines
Quoted 4 lines

so the case may fail when busybox is not present, this case
is used for checking "bitbake -g", so check core-image-minimal itself is more reliable.

It's true that busybox may not be present but we want to test that some package is in the image, not just that the task-depends.dot file exists and mentions c-i-m. How about searching for 'base-files' ?

The base-files is my first thought, but it's not a must either, for testing "bitbake -g recipe", I think that check the recipe itself is more reliable than others.

// Robert

Quoted 31 lines

../Randy

Quoted 26 lines

---
  meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--

  1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/cases/bbtests.py +0 -0
index 8e59baf..4103396 100644
@@ -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 = 'core-image-minimal'
+        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')

#4 lore raw
Quoted 20 lines · Robert Yang

Hi Randy,

Quoted 17 lines · Randy MacLeod
Quoted 3 lines · Robert Yang

It checked whether busybox is in pn-buildlist and task-depends.dot after run "bitbake -g core-image-minimal", but busybox is not a must for core-image-minimal,

You should explain why busybox is not a must since usually busybox is the key package in c-i-m.

We have some images that deliberately exclude busybox and
I think this was found by using:
echo "BB_NO_NETWORK = \"0\"" >> conf/local.conf
echo "PNWHITELIST_LAYERS_remove = \"selftest\"" >> conf/local.conf echo "SANITY_TESTED_DISTROS = \"\"" >> conf/local.conf
echo "DISTRO = \"wrlinux-graphics\"" >> conf/local.conf
echo "VIRTUAL-RUNTIME_no-busybox_forcevariable = \"\"" >> conf/local.conf echo "PNWHITELIST_meta-layer0 += 'layerappendtest'" >> conf/local.conf

Quoted 6 lines
Quoted 2 lines

so mention that in general and VIRTUAL-RUNTIME_no-busybox_forcevariable specifically.

Thanks for the explanation, I think that the maintainers know busybox is not a must in oe-core, not matter for core-image-minimal or sato, so I didn't add very detailed explanations.

commit logs are for maintainers, developers and users all of varying ranges of familiarity with oe-core so it's better to over-explain, without going over the top, IMO.

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

so the case may fail when busybox is not present, this case
is used for checking "bitbake -g", so check core-image-minimal itself is more reliable.

Quoted 8 lines
Quoted 4 lines

It's true that busybox may not be present but we want to test that some package is in the image, not just that the task-depends.dot file exists and mentions c-i-m. How about searching for 'base-files' ?

The base-files is my first thought, but it's not a must either, for testing "bitbake -g recipe", I think that check the recipe itself is more reliable than others.

If you had explained that in the commit log,
I wouldn't have replied, eh? ;-)

Sure base-files might not be part of the image but I haven't seen an image that has done that. Your check will always work so it really depends on the intent of the original check.

../Randy

Quoted 34 lines

// Robert

Quoted 31 lines

../Randy

Quoted 26 lines

---
  meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--

  1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/cases/bbtests.py +0 -0
index 8e59baf..4103396 100644
@@ -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 = 'core-image-minimal'
+        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')

Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#5 lore raw
Quoted 47 lines · Randy MacLeod
Quoted 20 lines · Robert Yang

Hi Randy,

Quoted 17 lines · Randy MacLeod
Quoted 3 lines · Robert Yang

It checked whether busybox is in pn-buildlist and task-depends.dot after run "bitbake -g core-image-minimal", but busybox is not a must for core-image-minimal,

You should explain why busybox is not a must since usually busybox is the key package in c-i-m.

We have some images that deliberately exclude busybox and
I think this was found by using:
echo "BB_NO_NETWORK = \"0\"" >> conf/local.conf
echo "PNWHITELIST_LAYERS_remove = \"selftest\"" >> conf/local.conf echo "SANITY_TESTED_DISTROS = \"\"" >> conf/local.conf
echo "DISTRO = \"wrlinux-graphics\"" >> conf/local.conf
echo "VIRTUAL-RUNTIME_no-busybox_forcevariable = \"\"" >> conf/local.conf echo "PNWHITELIST_meta-layer0 += 'layerappendtest'" >> conf/local.conf

Quoted 6 lines
Quoted 2 lines

so mention that in general and VIRTUAL-RUNTIME_no-busybox_forcevariable specifically.

Thanks for the explanation, I think that the maintainers know busybox is not a must in oe-core, not matter for core-image-minimal or sato, so I didn't add very detailed explanations.

commit logs are for maintainers, developers and users all of varying ranges of familiarity with oe-core so it's better to over-explain, without going over the top, IMO.

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

so the case may fail when busybox is not present, this case
is used for checking "bitbake -g", so check core-image-minimal itself is more reliable.

Quoted 8 lines
Quoted 4 lines

It's true that busybox may not be present but we want to test that some package is in the image, not just that the task-depends.dot file exists and mentions c-i-m. How about searching for 'base-files' ?

The base-files is my first thought, but it's not a must either, for testing "bitbake -g recipe", I think that check the recipe itself is more reliable than others.

Quoted 7 lines

If you had explained that in the commit log,
I wouldn't have replied, eh? ;-)

Sure base-files might not be part of the image but I haven't seen an image that has done that. Your check will always work so it really depends on the intent of the original check.

Yes, make sense, I will send a V2 to check base-files.

// Robert

Quoted 39 lines

../Randy

Quoted 34 lines

// Robert

Quoted 31 lines

../Randy

Quoted 26 lines

---
  meta/lib/oeqa/selftest/cases/bbtests.py | 5 +++--

  1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/cases/bbtests.py +0 -0
index 8e59baf..4103396 100644
@@ -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 = 'core-image-minimal'
+        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')