diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-05-16 14:36:27 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-25 22:59:56 +0100 |
| commit | dcba2302adab47b398f1ce7d09c38828ea9ae426 (patch) | |
| tree | d6681c4e5f572a5c6f9230af08bf5304e41350e9 | |
| parent | 55726e931536ed0cbd7b80588060b05a3145c934 (diff) | |
| download | openembedded-core-dcba2302adab47b398f1ce7d09c38828ea9ae426.tar.gz openembedded-core-dcba2302adab47b398f1ce7d09c38828ea9ae426.tar.bz2 openembedded-core-dcba2302adab47b398f1ce7d09c38828ea9ae426.zip | |
oeqa.utils.git: implement GitRepo.get_current_branch()
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/lib/oeqa/buildperf/base.py | 7 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/git.py | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 6a8d9feb02..adc3da3e2c 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -116,12 +116,9 @@ class BuildPerfTestResult(unittest.TextTestResult): if not rev: rev = self.repo.rev_parse('HEAD') if not branch: - try: - # Strip 11 chars, i.e. 'refs/heads' from the beginning - branch = self.repo.run_cmd(['symbolic-ref', 'HEAD'])[11:] - except GitError: + branch = self.repo.get_current_branch() + if not branch: log.debug('Currently on detached HEAD') - branch = None return str(rev), str(branch) def addSuccess(self, test): diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py index 647465467d..0fc8112321 100644 --- a/meta/lib/oeqa/utils/git.py +++ b/meta/lib/oeqa/utils/git.py @@ -46,4 +46,12 @@ class GitRepo(object): # Revision does not exist return None + def get_current_branch(self): + """Get current branch""" + try: + # Strip 11 chars, i.e. 'refs/heads' from the beginning + return self.run_cmd(['symbolic-ref', 'HEAD'])[11:] + except GitError: + return None + |