diff options
Diffstat (limited to 'poky/meta/lib/patchtest/tests/test_mbox_merge.py')
| -rw-r--r-- | poky/meta/lib/patchtest/tests/test_mbox_merge.py | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/poky/meta/lib/patchtest/tests/test_mbox_merge.py b/poky/meta/lib/patchtest/tests/test_mbox_merge.py deleted file mode 100644 index c8b6718d15..0000000000 --- a/poky/meta/lib/patchtest/tests/test_mbox_merge.py +++ /dev/null @@ -1,25 +0,0 @@ -# Check if mbox was merged by patchtest -# -# Copyright (C) 2016 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0 - -import subprocess -import base -from data import PatchTestInput - -def headlog(): - output = subprocess.check_output( - "cd %s; git log --pretty='%%h#%%aN#%%cD:#%%s' -1" % PatchTestInput.repodir, - universal_newlines=True, - shell=True - ) - return output.split('#') - -class Merge(base.Base): - def test_series_merge_on_head(self): - if not PatchTestInput.repo.ismerged: - commithash, author, date, shortlog = headlog() - self.fail('Series does not apply on top of target branch', - 'Rebase your series on top of targeted branch', - data=[('Targeted branch', '%s (currently at %s)' % (PatchTestInput.repo.branch, commithash))]) |