diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/oelib/buildhistory.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 802a91a488..042ccdd2b4 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | |||
@@ -1,8 +1,11 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
3 | # | 5 | # |
4 | 6 | ||
5 | import os | 7 | import os |
8 | import sys | ||
6 | from oeqa.selftest.case import OESelftestTestCase | 9 | from oeqa.selftest.case import OESelftestTestCase |
7 | import tempfile | 10 | import tempfile |
8 | import operator | 11 | import operator |
@@ -11,15 +14,14 @@ from oeqa.utils.commands import get_bb_var | |||
11 | class TestBlobParsing(OESelftestTestCase): | 14 | class TestBlobParsing(OESelftestTestCase): |
12 | 15 | ||
13 | def setUp(self): | 16 | def setUp(self): |
14 | import time | ||
15 | self.repo_path = tempfile.mkdtemp(prefix='selftest-buildhistory', | 17 | self.repo_path = tempfile.mkdtemp(prefix='selftest-buildhistory', |
16 | dir=get_bb_var('TOPDIR')) | 18 | dir=get_bb_var('TOPDIR')) |
17 | 19 | ||
18 | try: | 20 | try: |
19 | from git import Repo | 21 | from git import Repo |
20 | self.repo = Repo.init(self.repo_path) | 22 | self.repo = Repo.init(self.repo_path) |
21 | except ImportError: | 23 | except ImportError as e: |
22 | self.skipTest('Python module GitPython is not present') | 24 | self.skipTest('Python module GitPython is not present (%s) (%s)' % (e, sys.path)) |
23 | 25 | ||
24 | self.test_file = "test" | 26 | self.test_file = "test" |
25 | self.var_map = {} | 27 | self.var_map = {} |
@@ -28,6 +30,16 @@ class TestBlobParsing(OESelftestTestCase): | |||
28 | import shutil | 30 | import shutil |
29 | shutil.rmtree(self.repo_path) | 31 | shutil.rmtree(self.repo_path) |
30 | 32 | ||
33 | @property | ||
34 | def heads_default(self): | ||
35 | """ | ||
36 | Support repos defaulting to master or to main branch | ||
37 | """ | ||
38 | try: | ||
39 | return self.repo.heads.main | ||
40 | except AttributeError: | ||
41 | return self.repo.heads.master | ||
42 | |||
31 | def commit_vars(self, to_add={}, to_remove = [], msg="A commit message"): | 43 | def commit_vars(self, to_add={}, to_remove = [], msg="A commit message"): |
32 | if len(to_add) == 0 and len(to_remove) == 0: | 44 | if len(to_add) == 0 and len(to_remove) == 0: |
33 | return | 45 | return |
@@ -65,10 +77,10 @@ class TestBlobParsing(OESelftestTestCase): | |||
65 | changesmap = { "foo-2" : ("2", "8"), "bar" : ("","4"), "bar-2" : ("","5")} | 77 | changesmap = { "foo-2" : ("2", "8"), "bar" : ("","4"), "bar-2" : ("","5")} |
66 | 78 | ||
67 | self.commit_vars(to_add = { "foo" : "1", "foo-2" : "2", "foo-3" : "3" }) | 79 | self.commit_vars(to_add = { "foo" : "1", "foo-2" : "2", "foo-3" : "3" }) |
68 | blob1 = self.repo.heads.master.commit.tree.blobs[0] | 80 | blob1 = self.heads_default.commit.tree.blobs[0] |
69 | 81 | ||
70 | self.commit_vars(to_add = { "foo-2" : "8", "bar" : "4", "bar-2" : "5" }) | 82 | self.commit_vars(to_add = { "foo-2" : "8", "bar" : "4", "bar-2" : "5" }) |
71 | blob2 = self.repo.heads.master.commit.tree.blobs[0] | 83 | blob2 = self.heads_default.commit.tree.blobs[0] |
72 | 84 | ||
73 | change_records = compare_dict_blobs(os.path.join(self.repo_path, self.test_file), | 85 | change_records = compare_dict_blobs(os.path.join(self.repo_path, self.test_file), |
74 | blob1, blob2, False, False) | 86 | blob1, blob2, False, False) |
@@ -84,10 +96,10 @@ class TestBlobParsing(OESelftestTestCase): | |||
84 | defaultmap = { x : ("default", "1") for x in ["PKG", "PKGE", "PKGV", "PKGR"]} | 96 | defaultmap = { x : ("default", "1") for x in ["PKG", "PKGE", "PKGV", "PKGR"]} |
85 | 97 | ||
86 | self.commit_vars(to_add = { "foo" : "1" }) | 98 | self.commit_vars(to_add = { "foo" : "1" }) |
87 | blob1 = self.repo.heads.master.commit.tree.blobs[0] | 99 | blob1 = self.heads_default.commit.tree.blobs[0] |
88 | 100 | ||
89 | self.commit_vars(to_add = { "PKG" : "1", "PKGE" : "1", "PKGV" : "1", "PKGR" : "1" }) | 101 | self.commit_vars(to_add = { "PKG" : "1", "PKGE" : "1", "PKGV" : "1", "PKGR" : "1" }) |
90 | blob2 = self.repo.heads.master.commit.tree.blobs[0] | 102 | blob2 = self.heads_default.commit.tree.blobs[0] |
91 | 103 | ||
92 | change_records = compare_dict_blobs(os.path.join(self.repo_path, self.test_file), | 104 | change_records = compare_dict_blobs(os.path.join(self.repo_path, self.test_file), |
93 | blob1, blob2, False, False) | 105 | blob1, blob2, False, False) |