Re: [OE-core] [PATCH 6/9] oeqa/oelib: test GitApplyTree patch names

["Mathieu Dubois-Briand" <mathieu.dubois-briand@bootlin.com>]

On Tue Jun 23, 2026 at 3:35 PM CEST, Anders Heimer wrote:
> Exercise both the git-am path and the fallback commit path through
> GitApplyTree.Import() and Push(). Verify that refs/notes/devtool records
> the original patch filename and that extractPatches() recreates patches
> with that name.
>
> AI-Generated: Claude Opus 4.6
>
> Reviewed-by: Daniel Turull <daniel.turull@ericsson.com>
> Signed-off-by: Anders Heimer <anders.heimer@est.tech>
> ---

Hi Anders,

Thanks for your patches.

> +    def test_fallback_preserves_original_patch_name(self):
> +        with tempfile.TemporaryDirectory(prefix="oe-gitapply-fallback-") as tmpdir:
> +            patchname = "plain-diff-original-name.patch"
> +            patch = self.make_plain_diff_patch(tmpdir, patchname)
> +            repo = self.make_repo(tmpdir, "target")
> +            tree = RecordingGitApplyTree(repo, PatchTestDataStore(tmpdir))
> +
> +            self.apply_patch(tree, patch)
> +
> +            self.assertTrue(tree.commitpatch_called)
> +            with open(os.path.join(repo, "file.txt")) as f:
> +                self.assertEqual(f.read(), "plain diff change\n")
> +            self.assert_note_and_extract(repo, patchname, "+plain diff change")

It looks like this test is failing on the autobuilder:

2026-06-23 20:45:59,362 - oe-selftest - INFO - oelib.patch.TestGitApplyTree.test_fallback_preserves_original_patch_name (subunit.RemotedTestCase)
2026-06-23 20:45:59,363 - oe-selftest - INFO -  ... FAIL
...
2026-06-23 20:45:59,363 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/oe-selftest-armhost/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/oelib/patch.py", line 272, in test_fallback_preserves_original_patch_name
    self.assertEqual(metadata, [
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^
        "Fallback Author",
        ^^^^^^^^^^^^^^^^^^
    ...<3 lines>...
        "2021-01-01T12:34:56+00:00",
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    ])
    ^^
  File "/usr/lib/python3.13/unittest/case.py", line 907, in assertEqual
    assertion_func(first, second, msg=msg)
    ~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.13/unittest/case.py", line 1113, in assertListEqual
    self.assertSequenceEqual(list1, list2, msg, seq_type=list)
    ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.13/unittest/case.py", line 1095, in assertSequenceEqual
    self.fail(msg)
    ~~~~~~~~~^^^^^
  File "/usr/lib/python3.13/unittest/case.py", line 732, in fail
    raise self.failureException(msg)
AssertionError: Lists differ: ['Fal[45 chars] 'OE Test', 'oe-test@example.com', '2021-01-01T12:34:56Z'] != ['Fal[45 chars] 'OE Test', 'oe-test@example.com', '2021-01-01T12:34:56+00:00']

First differing element 4:
'2021-01-01T12:34:56Z'
'2021-01-01T12:34:56+00:00'

  ['Fallback Author',
   'fallback.author@example.com',
   'OE Test',
   'oe-test@example.com',
-  '2021-01-01T12:34:56Z']
?                      ^

+  '2021-01-01T12:34:56+00:00']
?                      ^^^^^^

https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/4191
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/3961

So for some reason the timezone part of the date is different : Z /
+00:00.

Yet it does work sometimes. It might be related to the host system:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/4130

Can you have a look at the issue?

Thanks,
Mathieu

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com