x/git-upstream
Code Issues Proposed changes

Additional scenarios that result in missed commits

Browse Source 
More complex scenarios showing problems with how searching for previous
commits that should be carried on import miss certain changes.

Change-Id: I830e55933ca87ce41cdd7f474b30ea083d313089
This commit is contained in:
Darragh Bailey
2014-12-10 17:43:32 +00:00
parent 77e560fa1d
commit e9bf6db057
2 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
git_upstream/tests/test_searchers.py
View File

@@ -356,3 +356,56 @@ class TestUpstreamMergeBaseSearcher(BaseTestCase):
expected_changes = ['E', 'I', 'B1', 'J']
self._verify_expected(tree, branches, expected_changes,
pattern='upstream/master')
def test_search_changes_approved_after_import_merge(self):
"""Construct a repo layout where using a complex layout involving
additional branches having been included, and a previous import from
upstream having been completed, test that if a change was created on
another branch before the previous import was created, and merged to
the target branch before the previous import was merged, can we find
it correctly.
i.e. will the searcher also include commit 'O' in the diagram below.
Repository layout being tested
O----
/ \
B---C---D---H---I---J---K master
/ \ /
/ ----G
/ /
/ B1--C1--D1 import/next
/ /
A---E---F---L---M upstream/master
"""
tree = [
('A', []),
('B', ['A']),
('C', ['B']),
('D', ['C']),
('E', ['A']),
('F', ['E']),
('B1', ['F']),
('C1', ['B1']),
('D1', ['C1']),
('G', ['D', '=D1']),
('O', ['C']),
('H', ['D', 'O']),
('I', ['H', 'G']),
('J', ['I']),
('K', ['J']),
('L', ['F']),
('M', ['L'])
]
branches = {
'head': ('master', 'K'),
'upstream': ('upstream/master', 'M'),
}
expected_changes = ["B1", "C1", "D1", "G", "O", "H", "I", "J", "K"]
self.expectFailure(
"Should fail to find change 'O'",
self._verify_expected, tree, branches, expected_changes)

53
git_upstream/tests/test_strategies.py
View File

@@ -183,3 +183,56 @@ class TestStrategies(BaseTestCase):
expected_changes = ["D1", "E1", "J", "K", "O", "Q"]
self._verify_expected(tree, branches, expected_changes)
def test_locate_changes_walk_changes_approved_after_import_merge(self):
"""Construct a repo layout where using a complex layout involving
additional branches having been included, and a previous import from
upstream having been completed, test that if a change was created on
another branch before the previous import was created, and merged to
the target branch before the previous import was merged, can we find
it correctly.
i.e. will the strategy also include commit 'O' in the diagram below.
Repository layout being tested
O----
/ \
B---C---D---H---I---J---K master
/ \ /
/ ----G
/ /
/ B1--C1--D1 import/next
/ /
A---E---F---L---M upstream/master
"""
tree = [
('A', []),
('B', ['A']),
('C', ['B']),
('D', ['C']),
('E', ['A']),
('F', ['E']),
('B1', ['F']),
('C1', ['B1']),
('D1', ['C1']),
('G', ['D', '=D1']),
('O', ['C']),
('H', ['D', 'O']),
('I', ['H', 'G']),
('J', ['I']),
('K', ['J']),
('L', ['F']),
('M', ['L'])
]
branches = {
'head': ('master', 'K'),
'upstream': ('upstream/master', 'M'),
}
expected_changes = ["B1", "C1", "D1", "O", "J", "K"]
self.expectFailure(
"Should fail to find change 'O'",
self._verify_expected, tree, branches, expected_changes)