From d557cbbf86767bc2ebf2beb3d70af3b3ca5e0529 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 Jul 2022 14:14:45 +0100 Subject: oeqa/selftest: rename git.py to intercept.py 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/git.py | 15 --------------- meta/lib/oeqa/selftest/cases/intercept.py | 15 +++++++++++++++ meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 meta/lib/oeqa/selftest/cases/git.py create mode 100644 meta/lib/oeqa/selftest/cases/intercept.py (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/cases/git.py b/meta/lib/oeqa/selftest/cases/git.py deleted file mode 100644 index f12874dc7d..0000000000 --- a/meta/lib/oeqa/selftest/cases/git.py +++ /dev/null @@ -1,15 +0,0 @@ -from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import bitbake - -class GitCheck(OESelftestTestCase): - def test_git_intercept(self): - """ - Git binaries with CVE-2022-24765 fixed will refuse to operate on a - repository which is owned by a different user. This breaks our - do_install task as that runs inside pseudo, so the git repository is - owned by the build user but git is running as (fake)root. - - We have an intercept which disables pseudo, so verify that it works. - """ - bitbake("git-submodule-test -c test_git_as_user") - bitbake("git-submodule-test -c test_git_as_root") diff --git a/meta/lib/oeqa/selftest/cases/intercept.py b/meta/lib/oeqa/selftest/cases/intercept.py new file mode 100644 index 0000000000..f12874dc7d --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/intercept.py @@ -0,0 +1,15 @@ +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import bitbake + +class GitCheck(OESelftestTestCase): + def test_git_intercept(self): + """ + Git binaries with CVE-2022-24765 fixed will refuse to operate on a + repository which is owned by a different user. This breaks our + do_install task as that runs inside pseudo, so the git repository is + owned by the build user but git is running as (fake)root. + + We have an intercept which disables pseudo, so verify that it works. + """ + bitbake("git-submodule-test -c test_git_as_user") + bitbake("git-submodule-test -c test_git_as_root") diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 802a91a488..33bd6df2f3 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 = {} -- cgit 1.2.3-korg