From: Babanpreet Singh <bbnpreetsingh@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Julien Stephan <jstephan@baylibre.com>,
Alexander Kanavin <alex.kanavin@gmail.com>,
Chris Laplante <chris.laplante@agilent.com>,
Adrian Freihofer <adrian.freihofer@siemens.com>,
Peter Kjellerstedt <pkj@axis.com>,
Babanpreet Singh <bbnpreetsingh@gmail.com>
Subject: [PATCH 2/2] oeqa/selftest/devtool: cover update-recipe --initial-rev
Date: Tue, 14 Jul 2026 05:01:06 +0000 [thread overview]
Message-ID: <20260714050107.7-2-bbnpreetsingh@gmail.com> (raw)
In-Reply-To: <20260714050107.7-1-bbnpreetsingh@gmail.com>
The --initial-rev option had no selftest coverage, which let the
regression fixed by the previous commit go unnoticed since 2023.
Extend test_devtool_update_recipe to run update-recipe twice more with
--initial-rev: once with the recorded initial revision, which must
produce the same result as not passing the option, and once with a
revision in the middle of the local commits, which must export only
the commits after it.
Without the fix in the previous commit, the first --initial-rev
invocation fails with "Unable to find initial revision - please
specify it with --initial-rev".
AI-Generated: Uses Claude (claude-fable-5)
Signed-off-by: Babanpreet Singh <bbnpreetsingh@gmail.com>
---
meta/lib/oeqa/selftest/cases/devtool.py | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index b2cd13e9a5..1bad223278 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1286,6 +1286,28 @@ class DevtoolUpdateTests(DevtoolBase):
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
--
2.43.0
prev parent reply other threads:[~2026-07-14 5:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-14 5:01 [PATCH 1/2] devtool: standard: fix update-recipe/finish --initial-rev override Babanpreet Singh
2026-07-14 5:01 ` Babanpreet Singh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260714050107.7-2-bbnpreetsingh@gmail.com \
--to=bbnpreetsingh@gmail.com \
--cc=adrian.freihofer@siemens.com \
--cc=alex.kanavin@gmail.com \
--cc=chris.laplante@agilent.com \
--cc=jstephan@baylibre.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=pkj@axis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox