summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorThomas Roos <throos@amazon.de>2023-05-19 14:09:58 +0200
committerSteve Sakoman <steve@sakoman.com>2023-07-12 05:13:59 -1000
commite211a16fb5000510de437d85fd32fdd575b4a0d6 (patch)
treef0636f4ef35a6b100d6710f5e092612157dd4291 /meta/lib/oeqa
parent82fd9eb08f755c55a05232f45638b0a2faa18bc8 (diff)
downloadpoky-e211a16fb5000510de437d85fd32fdd575b4a0d6.tar.gz
oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo
Devtool selftests require poky dir a git repo, when downloading poky as a tar, this is not the case. Those tests will now skipped. [YOCTO #12389] (From OE-Core rev: 5f3128e3a85e3a5d67d5dc1f2585fe6c236e443c) Signed-off-by: Thomas Roos <throos@amazon.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 95a5bc130dc51ea9de95c64dbf0e9c7892415d50) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 5febdde28e..9efe342a0d 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -8,6 +8,7 @@ import shutil
8import tempfile 8import tempfile
9import glob 9import glob
10import fnmatch 10import fnmatch
11import unittest
11 12
12import oeqa.utils.ftools as ftools 13import oeqa.utils.ftools as ftools
13from oeqa.selftest.case import OESelftestTestCase 14from oeqa.selftest.case import OESelftestTestCase
@@ -38,6 +39,13 @@ def setUpModule():
38 canonical_layerpath = os.path.realpath(canonical_layerpath) + '/' 39 canonical_layerpath = os.path.realpath(canonical_layerpath) + '/'
39 edited_layers.append(layerpath) 40 edited_layers.append(layerpath)
40 oldmetapath = os.path.realpath(layerpath) 41 oldmetapath = os.path.realpath(layerpath)
42
43 # when downloading poky from tar.gz some tests will be skipped (BUG 12389)
44 try:
45 runCmd('git rev-parse --is-inside-work-tree', cwd=canonical_layerpath)
46 except:
47 raise unittest.SkipTest("devtool tests require folder to be a git repo")
48
41 result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath) 49 result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath)
42 oldreporoot = result.output.rstrip() 50 oldreporoot = result.output.rstrip()
43 newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot)) 51 newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot))