Skip to contentSkip to conversation

oeqa/selftest: add test case to cover 'devtool modify -n' for a git recipe

PATCH In review [email protected] 3 participants 4 messages Jan 22, 2024 – Jan 26, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oeqa/selftest: add test case to cover 'devtool modify -n' for a git recipe

From: Chen Qi <[email protected]>

Add a test case to ensure the following error does not happen again for 'devtool modify -n'.

Traceback (most recent call last):
File "/buildarea2/chenqi/poky/scripts/devtool", line 349, in <module>
ret = main()
File "/buildarea2/chenqi/poky/scripts/devtool", line 336, in main
ret = args.func(args, config, basepath, workspace)
File "/buildarea2/chenqi/poky/scripts/lib/devtool/standard.py", line 924, in modify

    if not initial_revs["."]:

KeyError: '.'

---
 meta/lib/oeqa/selftest/cases/devtool.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
meta/lib/oeqa/selftest/cases/devtool.py +22 -0
index a877720769..22ea0ecba9 100644
@@ -917,6 +917,28 @@ class DevtoolModifyTests(DevtoolBase):
         # Try building
         bitbake(testrecipe)
 
+    def test_devtool_modify_git_no_extract(self):
+        # Check preconditions
+        testrecipe = 'psplash'
+        src_uri = get_bb_var('SRC_URI', testrecipe)
+        self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
+        # Clean up anything in the workdir/sysroot/sstate cache
+        bitbake('%s -c cleansstate' % testrecipe)
+        # Try modifying a recipe
+        tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+        self.track_for_cleanup(tempdir)
+        self.track_for_cleanup(self.workspacedir)
+        self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe)
+        self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+        result = runCmd('git clone https://git.yoctoproject.org/psplash %s && devtool modify -n %s %s' % (tempdir, testrecipe, tempdir))
+        self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created. devtool output: %s' % result.output)
+        matches = glob.glob(os.path.join(self.workspacedir, 'appends', 'psplash_*.bbappend'))
+        self.assertTrue(matches, 'bbappend not created')
+        # Test devtool status
+        result = runCmd('devtool status')
+        self.assertIn(testrecipe, result.output)
+        self.assertIn(tempdir, result.output)
+
     def test_devtool_modify_git_crates_subpath(self):
         # This tests two things in devtool context:
         #   - that we support local git dependencies for cargo based recipe
Signature · 1 line
2.34.1
#1 lore raw
Quoted 24 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

Add a test case to ensure the following error does not happen again for 'devtool modify -n'.

Traceback (most recent call last):
File "/buildarea2/chenqi/poky/scripts/devtool", line 349, in <module>
ret = main()
File "/buildarea2/chenqi/poky/scripts/devtool", line 336, in main
ret = args.func(args, config, basepath, workspace)
File "/buildarea2/chenqi/poky/scripts/lib/devtool/standard.py", line 924, in modify

    if not initial_revs["."]:

KeyError: '.'

---
 meta/lib/oeqa/selftest/cases/devtool.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
meta/lib/oeqa/selftest/cases/devtool.py +0 -0
index a877720769..22ea0ecba9 100644

meta/lib/oeqa/selftest/cases/devtool.py class DevtoolModifyTests(DevtoolBase): · line 926

Quoted 10 lines
meta/lib/oeqa/selftest/cases/devtool.py +7 -0
@@ -917,6 +917,28 @@ class DevtoolModifyTests(DevtoolBase):
         # Try building
         bitbake(testrecipe)
 
+    def test_devtool_modify_git_no_extract(self):
+        # Check preconditions
+        testrecipe = 'psplash'
+        src_uri = get_bb_var('SRC_URI', testrecipe)
+        self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
+        # Clean up anything in the workdir/sysroot/sstate cache
+        bitbake('%s -c cleansstate' % testrecipe)

I'm afraid we can't use cleansstate inside oe-selftest as it may race against other copies of oe-selftest running against the same sstate cache (or other builds using psplash in this case).

We'll need to find another way to make this work.

Cheers,

Richard

#2 lore raw
Quoted 8 lines · Richard Purdie

meta/lib/oeqa/selftest/cases/devtool.py class DevtoolModifyTests(DevtoolBase): · line 926

Quoted 7 lines
meta/lib/oeqa/selftest/cases/devtool.py +7 -0
+    def test_devtool_modify_git_no_extract(self):
+        # Check preconditions
+        testrecipe = 'psplash'
+        src_uri = get_bb_var('SRC_URI', testrecipe)
+        self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
+        # Clean up anything in the workdir/sysroot/sstate cache
+        bitbake('%s -c cleansstate' % testrecipe)
Quoted 5 lines

I'm afraid we can't use cleansstate inside oe-selftest as it may race against other copies of oe-selftest running against the same sstate cache (or other builds using psplash in this case).

We'll need to find another way to make this work.

There's a number of existing tests in meta/lib/oeqa/selftest/cases/devtool.py which do rely on cleansstate; I can only presume they do it with utmost care, and can be used as examples for how things could be done.

Alex

#3 lore raw
Quoted 15 lines · Alexander Kanavin
Quoted 12 lines · Richard Purdie

meta/lib/oeqa/selftest/cases/devtool.py class DevtoolModifyTests(DevtoolBase): · line 926

Quoted 7 lines
meta/lib/oeqa/selftest/cases/devtool.py +7 -0
+    def test_devtool_modify_git_no_extract(self):
+        # Check preconditions
+        testrecipe = 'psplash'
+        src_uri = get_bb_var('SRC_URI', testrecipe)
+        self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
+        # Clean up anything in the workdir/sysroot/sstate cache
+        bitbake('%s -c cleansstate' % testrecipe)

I'm afraid we can't use cleansstate inside oe-selftest as it may race against other copies of oe-selftest running against the same sstate cache (or other builds using psplash in this case).

Quoted 6 lines
Quoted 1 line

We'll need to find another way to make this work.

There's a number of existing tests in meta/lib/oeqa/selftest/cases/devtool.py which do rely on cleansstate; I can only presume they do it with utmost care, and can be used as examples for how things could be done.

Thanks for the reminder. devtool is "special" in that it does:

cls.sstate_conf = 'SSTATE_DIR = "%s"\n' % cls.devtool_sstate cls.sstate_conf += ('SSTATE_MIRRORS += "file://.* file:///%s/PATH"\n' % cls.original_sstate)

in DevtoolBase which means it can call cleansstate.

I'll queue it for merge, thanks.

Cheers,

Richard