Forgot the branch prefix, resending.
Ross
> On 25 Aug 2022, at 14:36, Ross Burton via lists.openembedded.org
> wrote:
>
> By naming this test class git.py, any attempt to import GitPython (as
> needed by oelib.buildhistory) failed.
>
> As this class exercises the intercepts, rename it to intercept.py.
>
> (From OE-Core rev: d557cbbf86767bc2ebf2beb3d70af3b3ca5e0529)
>
> Signed-off-by: Ross Burton
> Signed-off-by: Richard Purdie
> ---
> meta/lib/oeqa/selftest/cases/{git.py => intercept.py} | 0
> meta/lib/oeqa/selftest/cases/oelib/buildhistory.py| 6 +++---
> 2 files changed, 3 insertions(+), 3 deletions(-)
> rename meta/lib/oeqa/selftest/cases/{git.py => intercept.py} (100%)
>
> diff --git a/meta/lib/oeqa/selftest/cases/git.py
> b/meta/lib/oeqa/selftest/cases/intercept.py
> similarity index 100%
> rename from meta/lib/oeqa/selftest/cases/git.py
> rename to meta/lib/oeqa/selftest/cases/intercept.py
> diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> index 802a91a4886..33bd6df2f3f 100644
> --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> @@ -3,6 +3,7 @@
> #
>
> import os
> +import sys
> from oeqa.selftest.case import OESelftestTestCase
> import tempfile
> import operator
> @@ -11,15 +12,14 @@ from oeqa.utils.commands import get_bb_var
> class TestBlobParsing(OESelftestTestCase):
>
> def setUp(self):
> -import time
> self.repo_path = tempfile.mkdtemp(prefix='selftest-buildhistory',
> dir=get_bb_var('TOPDIR'))
>
> try:
> from git import Repo
> self.repo = Repo.init(self.repo_path)
> -except ImportError:
> -self.skipTest('Python module GitPython is not present')
> +except ImportError as e:
> +self.skipTest('Python module GitPython is not present (%s)
> (%s)' % (e, sys.path))
>
> self.test_file = "test"
> self.var_map = {}
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#169872):
https://lists.openembedded.org/g/openembedded-core/message/169872
Mute This Topic: https://lists.openembedded.org/mt/93248157/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
