mirrors/poky
1
0 Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-10-21 06:48:18 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest/devtool: cover update-recipe --initial-rev

Browse Source 
The --initial-rev option had no selftest coverage. Extend
test_devtool_update_recipe to run update-recipe with --initial-rev
set to the recorded initial revision, which should match the default
output, and to a revision partway through the local commits, which
should export only the commits after it.

AI-Generated: Uses Claude (claude-fable-5)
(From OE-Core rev: c2c94a081d812c4712726cb5fc59b878af600cc0)

Signed-off-by: Babanpreet Singh <bbnpreetsingh@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 171af3b2915dd076c8d1b205ff75eac1ebd5a586)
[Adjusted for scarthgap: also takes the cleanup_cmd change to this test
from de635a9bc0 ("mdadm: fetch from git"), which the new steps rely on]
Signed-off-by: Babanpreet Singh <bbnpreetsingh@gmail.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
Babanpreet Singh authored and Paul Barker committed 2026-10-19 09:03:17 +01:00
1 parent 060ed2c5d8
commit c3c8f3e211
1 file changed
+26 -1
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/devtool.py
+26 -1
View File
@@ -1186,13 +1186,38 @@ class DevtoolUpdateTests(DevtoolBase):
result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir)
result = runCmd('git add devtool-new-file', cwd=tempdir)
result = runCmd('git commit -m "Add a new file"', cwd=tempdir)
self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)))
cleanup_cmd = 'cd %s; rm %s/*.patch; git add %s; git checkout %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))
self.add_command_to_tearDown(cleanup_cmd)
result = runCmd('devtool update-recipe %s' % testrecipe)
result = runCmd('git add minicom', cwd=os.path.dirname(recipefile))
expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)),
('A ', '.*/0001-Change-the-README.patch$'),
('A ', '.*/0002-Add-a-new-file.patch$')]
self._check_repo_status(os.path.dirname(recipefile), expected_status)
result = runCmd(cleanup_cmd)
self._check_repo_status(os.path.dirname(recipefile), [])
# Now try the same passing --initial-rev: the recorded initial
# revision must give the same result as not passing the option, and a
# later revision must export only the commits after it
result = runCmd('git rev-parse devtool-base', cwd=tempdir)
initial_rev = result.output.strip()
result = runCmd('devtool update-recipe --initial-rev %s %s' % (initial_rev, testrecipe))
result = runCmd('git add minicom', cwd=os.path.dirname(recipefile))
expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)),
('A ', '.*/0001-Change-the-README.patch$'),
('A ', '.*/0002-Add-a-new-file.patch$')]
self._check_repo_status(os.path.dirname(recipefile), expected_status)
result = runCmd(cleanup_cmd)
self._check_repo_status(os.path.dirname(recipefile), [])
result = runCmd('git rev-parse HEAD~1', cwd=tempdir)
midpoint_rev = result.output.strip()
result = runCmd('devtool update-recipe --initial-rev %s %s' % (midpoint_rev, testrecipe))
result = runCmd('git add minicom', cwd=os.path.dirname(recipefile))
expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)),
('A ', '.*/0001-Add-a-new-file.patch$')]
self._check_repo_status(os.path.dirname(recipefile), expected_status)
result = runCmd(cleanup_cmd)
self._check_repo_status(os.path.dirname(recipefile), [])
def test_devtool_update_recipe_git(self):
# Check preconditions