← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_graph.py

(gz) Merge 2.4 for one more test fix with newer zlib (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_graph.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
from bzrlib import (
18
18
    errors,
19
19
    graph as _mod_graph,
20
 
    symbol_versioning,
21
20
    tests,
22
21
    )
23
22
from bzrlib.revision import NULL_REVISION
24
23
from bzrlib.tests import TestCaseWithMemoryTransport
25
 
from bzrlib.symbol_versioning import deprecated_in
26
24
 
27
25
 
28
26
# Ancestry 1:
426
424
    def __init__(self, parents_provider):
427
425
        self.calls = []
428
426
        self._real_parents_provider = parents_provider
 
427
        get_cached = getattr(parents_provider, 'get_cached_parent_map', None)
 
428
        if get_cached is not None:
 
429
            # Only expose the underlying 'get_cached_parent_map' function if
 
430
            # the wrapped provider has it.
 
431
            self.get_cached_parent_map = self._get_cached_parent_map
429
432
 
430
433
    def get_parent_map(self, nodes):
431
434
        self.calls.extend(nodes)
432
435
        return self._real_parents_provider.get_parent_map(nodes)
433
436
 
 
437
    def _get_cached_parent_map(self, nodes):
 
438
        self.calls.append(('cached', sorted(nodes)))
 
439
        return self._real_parents_provider.get_cached_parent_map(nodes)
 
440
 
 
441
 
 
442
class SharedInstrumentedParentsProvider(object):
 
443
 
 
444
    def __init__(self, parents_provider, calls, info):
 
445
        self.calls = calls
 
446
        self.info = info
 
447
        self._real_parents_provider = parents_provider
 
448
        get_cached = getattr(parents_provider, 'get_cached_parent_map', None)
 
449
        if get_cached is not None:
 
450
            # Only expose the underlying 'get_cached_parent_map' function if
 
451
            # the wrapped provider has it.
 
452
            self.get_cached_parent_map = self._get_cached_parent_map
 
453
 
 
454
    def get_parent_map(self, nodes):
 
455
        self.calls.append((self.info, sorted(nodes)))
 
456
        return self._real_parents_provider.get_parent_map(nodes)
 
457
 
 
458
    def _get_cached_parent_map(self, nodes):
 
459
        self.calls.append((self.info, 'cached', sorted(nodes)))
 
460
        return self._real_parents_provider.get_cached_parent_map(nodes)
 
461
 
434
462
 
435
463
class TestGraphBase(tests.TestCase):
436
464
 
675
703
        self.assertEqual((set(['e']), set(['f', 'g'])),
676
704
                         graph.find_difference('e', 'f'))
677
705
 
678
 
 
679
 
    def test_stacked_parents_provider(self):
680
 
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
681
 
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
682
 
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
683
 
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
684
 
                         stacked.get_parent_map(['rev1', 'rev2']))
685
 
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
686
 
                         stacked.get_parent_map(['rev2', 'rev1']))
687
 
        self.assertEqual({'rev2':['rev3']},
688
 
                         stacked.get_parent_map(['rev2', 'rev2']))
689
 
        self.assertEqual({'rev1':['rev4']},
690
 
                         stacked.get_parent_map(['rev1', 'rev1']))
691
 
    
692
 
    def test_stacked_parents_provider_overlapping(self):
693
 
        # rev2 is availible in both providers.
694
 
        # 1
695
 
        # |
696
 
        # 2
697
 
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
698
 
        parents2 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
699
 
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
700
 
        self.assertEqual({'rev2': ['rev1']},
701
 
                         stacked.get_parent_map(['rev2']))
702
 
 
703
 
    def test__stacked_parents_provider_deprecated(self):
704
 
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
705
 
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
706
 
        stacked = self.applyDeprecated(deprecated_in((1, 16, 0)),
707
 
                    _mod_graph._StackedParentsProvider, [parents1, parents2])
708
 
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
709
 
                         stacked.get_parent_map(['rev1', 'rev2']))
710
 
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
711
 
                         stacked.get_parent_map(['rev2', 'rev1']))
712
 
        self.assertEqual({'rev2':['rev3']},
713
 
                         stacked.get_parent_map(['rev2', 'rev2']))
714
 
        self.assertEqual({'rev1':['rev4']},
715
 
                         stacked.get_parent_map(['rev1', 'rev1']))
716
 
 
717
706
    def test_iter_topo_order(self):
718
707
        graph = self.make_graph(ancestry_1)
719
708
        args = ['rev2a', 'rev3', 'rev1']
1040
1029
                search.start_searching(starts)
1041
1030
            if stops is not None:
1042
1031
                search.stop_searching_any(stops)
1043
 
            result = search.get_result()
1044
 
            self.assertEqual(recipe, result.get_recipe())
1045
 
            self.assertEqual(set(included_keys), result.get_keys())
 
1032
            state = search.get_state()
 
1033
            self.assertEqual(set(included_keys), state[2])
1046
1034
            self.assertEqual(seen, search.seen)
1047
1035
 
1048
1036
    def test_breadth_first_get_result_excludes_current_pending(self):
1053
1041
            })
1054
1042
        search = graph._make_breadth_first_searcher(['head'])
1055
1043
        # At the start, nothing has been seen, to its all excluded:
1056
 
        result = search.get_result()
1057
 
        self.assertEqual(('search', set(['head']), set(['head']), 0),
1058
 
            result.get_recipe())
1059
 
        self.assertEqual(set(), result.get_keys())
 
1044
        state = search.get_state()
 
1045
        self.assertEqual((set(['head']), set(['head']), set()),
 
1046
            state)
1060
1047
        self.assertEqual(set(), search.seen)
1061
1048
        # using next:
1062
1049
        expected = [
1085
1072
        # Starting with nothing and adding a search works:
1086
1073
        search.start_searching(['head'])
1087
1074
        # head has been seen:
1088
 
        result = search.get_result()
1089
 
        self.assertEqual(('search', set(['head']), set(['child']), 1),
1090
 
            result.get_recipe())
1091
 
        self.assertEqual(set(['head']), result.get_keys())
 
1075
        state = search.get_state()
 
1076
        self.assertEqual((set(['head']), set(['child']), set(['head'])),
 
1077
            state)
1092
1078
        self.assertEqual(set(['head']), search.seen)
1093
1079
        # using next:
1094
1080
        expected = [
1245
1231
        self.assertSeenAndResult(expected, search, search.next)
1246
1232
        self.assertRaises(StopIteration, search.next)
1247
1233
        self.assertEqual(set(['head', 'ghost', NULL_REVISION]), search.seen)
1248
 
        result = search.get_result()
1249
 
        self.assertEqual(('search', set(['ghost', 'head']), set(['ghost']), 2),
1250
 
            result.get_recipe())
1251
 
        self.assertEqual(set(['head', NULL_REVISION]), result.get_keys())
 
1234
        state = search.get_state()
 
1235
        self.assertEqual(
 
1236
            (set(['ghost', 'head']), set(['ghost']),
 
1237
                set(['head', NULL_REVISION])),
 
1238
            state)
1252
1239
        # using next_with_ghosts:
1253
1240
        search = graph._make_breadth_first_searcher(['head'])
1254
1241
        self.assertSeenAndResult(expected, search, search.next_with_ghosts)
1255
1242
        self.assertRaises(StopIteration, search.next)
1256
1243
        self.assertEqual(set(['head', 'ghost', NULL_REVISION]), search.seen)
1257
 
        result = search.get_result()
1258
 
        self.assertEqual(('search', set(['ghost', 'head']), set(['ghost']), 2),
1259
 
            result.get_recipe())
1260
 
        self.assertEqual(set(['head', NULL_REVISION]), result.get_keys())
 
1244
        state = search.get_state()
 
1245
        self.assertEqual(
 
1246
            (set(['ghost', 'head']), set(['ghost']),
 
1247
                set(['head', NULL_REVISION])),
 
1248
            state)
1261
1249
 
1262
1250
 
1263
1251
class TestFindUniqueAncestors(TestGraphBase):
1489
1477
 
1490
1478
    def setUp(self):
1491
1479
        super(TestCachingParentsProvider, self).setUp()
1492
 
        dict_pp = _mod_graph.DictParentsProvider({'a':('b',)})
 
1480
        dict_pp = _mod_graph.DictParentsProvider({'a': ('b',)})
1493
1481
        self.inst_pp = InstrumentedParentsProvider(dict_pp)
1494
1482
        self.caching_pp = _mod_graph.CachingParentsProvider(self.inst_pp)
1495
1483
 
1534
1522
        self.assertEqual([], self.inst_pp.calls)
1535
1523
        self.assertEqual(set(['b']), self.caching_pp.missing_keys)
1536
1524
 
 
1525
    def test_get_cached_parent_map(self):
 
1526
        self.assertEqual({}, self.caching_pp.get_cached_parent_map(['a']))
 
1527
        self.assertEqual([], self.inst_pp.calls)
 
1528
        self.assertEqual({'a': ('b',)}, self.caching_pp.get_parent_map(['a']))
 
1529
        self.assertEqual(['a'], self.inst_pp.calls)
 
1530
        self.assertEqual({'a': ('b',)},
 
1531
                         self.caching_pp.get_cached_parent_map(['a']))
 
1532
 
1537
1533
 
1538
1534
class TestCachingParentsProviderExtras(tests.TestCaseWithTransport):
1539
1535
    """Test the behaviour when parents are provided that were not requested."""
1598
1594
                         self.caching_pp.get_parent_map(['rev2']))
1599
1595
        self.assertEqual(['rev3'], self.inst_pp.calls)
1600
1596
 
 
1597
    def test_extras_using_cached(self):
 
1598
        self.assertEqual({}, self.caching_pp.get_cached_parent_map(['rev3']))
 
1599
        self.assertEqual({}, self.caching_pp.get_parent_map(['rev3']))
 
1600
        self.assertEqual({'rev2': ['rev1']},
 
1601
                         self.caching_pp.get_cached_parent_map(['rev2']))
 
1602
        self.assertEqual(['rev3'], self.inst_pp.calls)
 
1603
 
 
1604
 
1601
1605
 
1602
1606
class TestCollapseLinearRegions(tests.TestCase):
1603
1607
 
1654
1658
        self.assertEqual(['D'], sorted(graph_thunk.heads(['D', 'C'])))
1655
1659
        self.assertEqual(['B', 'C'], sorted(graph_thunk.heads(['B', 'C'])))
1656
1660
 
1657
 
 
1658
 
class TestPendingAncestryResultGetKeys(TestCaseWithMemoryTransport):
1659
 
    """Tests for bzrlib.graph.PendingAncestryResult."""
1660
 
 
1661
 
    def test_get_keys(self):
1662
 
        builder = self.make_branch_builder('b')
1663
 
        builder.start_series()
1664
 
        builder.build_snapshot('rev-1', None, [
1665
 
            ('add', ('', 'root-id', 'directory', ''))])
1666
 
        builder.build_snapshot('rev-2', ['rev-1'], [])
1667
 
        builder.finish_series()
1668
 
        repo = builder.get_branch().repository
1669
 
        repo.lock_read()
1670
 
        self.addCleanup(repo.unlock)
1671
 
        result = _mod_graph.PendingAncestryResult(['rev-2'], repo)
1672
 
        self.assertEqual(set(['rev-1', 'rev-2']), set(result.get_keys()))
1673
 
 
1674
 
    def test_get_keys_excludes_ghosts(self):
1675
 
        builder = self.make_branch_builder('b')
1676
 
        builder.start_series()
1677
 
        builder.build_snapshot('rev-1', None, [
1678
 
            ('add', ('', 'root-id', 'directory', ''))])
1679
 
        builder.build_snapshot('rev-2', ['rev-1', 'ghost'], [])
1680
 
        builder.finish_series()
1681
 
        repo = builder.get_branch().repository
1682
 
        repo.lock_read()
1683
 
        self.addCleanup(repo.unlock)
1684
 
        result = _mod_graph.PendingAncestryResult(['rev-2'], repo)
1685
 
        self.assertEqual(sorted(['rev-1', 'rev-2']), sorted(result.get_keys()))
1686
 
 
1687
 
    def test_get_keys_excludes_null(self):
1688
 
        # Make a 'graph' with an iter_ancestry that returns NULL_REVISION
1689
 
        # somewhere other than the last element, which can happen in real
1690
 
        # ancestries.
1691
 
        class StubGraph(object):
1692
 
            def iter_ancestry(self, keys):
1693
 
                return [(NULL_REVISION, ()), ('foo', (NULL_REVISION,))]
1694
 
        result = _mod_graph.PendingAncestryResult(['rev-3'], None)
1695
 
        result_keys = result._get_keys(StubGraph())
1696
 
        # Only the non-null keys from the ancestry appear.
1697
 
        self.assertEqual(set(['foo']), set(result_keys))
1698
 
 
1699
 
 
1700
 
class TestPendingAncestryResultRefine(TestGraphBase):
1701
 
 
1702
 
    def test_refine(self):
1703
 
        # Used when pulling from a stacked repository, so test some revisions
1704
 
        # being satisfied from the stacking branch.
1705
 
        g = self.make_graph(
1706
 
            {"tip":["mid"], "mid":["base"], "tag":["base"],
1707
 
             "base":[NULL_REVISION], NULL_REVISION:[]})
1708
 
        result = _mod_graph.PendingAncestryResult(['tip', 'tag'], None)
1709
 
        result = result.refine(set(['tip']), set(['mid']))
1710
 
        self.assertEqual(set(['mid', 'tag']), result.heads)
1711
 
        result = result.refine(set(['mid', 'tag', 'base']),
1712
 
            set([NULL_REVISION]))
1713
 
        self.assertEqual(set([NULL_REVISION]), result.heads)
1714
 
        self.assertTrue(result.is_empty())
1715
 
 
1716
 
 
1717
 
class TestSearchResultRefine(TestGraphBase):
1718
 
 
1719
 
    def test_refine(self):
1720
 
        # Used when pulling from a stacked repository, so test some revisions
1721
 
        # being satisfied from the stacking branch.
1722
 
        g = self.make_graph(
1723
 
            {"tip":["mid"], "mid":["base"], "tag":["base"],
1724
 
             "base":[NULL_REVISION], NULL_REVISION:[]})
1725
 
        result = _mod_graph.SearchResult(set(['tip', 'tag']),
1726
 
            set([NULL_REVISION]), 4, set(['tip', 'mid', 'tag', 'base']))
1727
 
        result = result.refine(set(['tip']), set(['mid']))
1728
 
        recipe = result.get_recipe()
1729
 
        # We should be starting from tag (original head) and mid (seen ref)
1730
 
        self.assertEqual(set(['mid', 'tag']), recipe[1])
1731
 
        # We should be stopping at NULL (original stop) and tip (seen head)
1732
 
        self.assertEqual(set([NULL_REVISION, 'tip']), recipe[2])
1733
 
        self.assertEqual(3, recipe[3])
1734
 
        result = result.refine(set(['mid', 'tag', 'base']),
1735
 
            set([NULL_REVISION]))
1736
 
        recipe = result.get_recipe()
1737
 
        # We should be starting from nothing (NULL was known as a cut point)
1738
 
        self.assertEqual(set([]), recipe[1])
1739
 
        # We should be stopping at NULL (original stop) and tip (seen head) and
1740
 
        # tag (seen head) and mid(seen mid-point head). We could come back and
1741
 
        # define this as not including mid, for minimal results, but it is
1742
 
        # still 'correct' to include mid, and simpler/easier.
1743
 
        self.assertEqual(set([NULL_REVISION, 'tip', 'tag', 'mid']), recipe[2])
1744
 
        self.assertEqual(0, recipe[3])
1745
 
        self.assertTrue(result.is_empty())
 
1661
    def test_add_node(self):
 
1662
        d = {('C',):[('A',)], ('B',): [('A',)], ('A',): []}
 
1663
        g = _mod_graph.KnownGraph(d)
 
1664
        graph_thunk = _mod_graph.GraphThunkIdsToKeys(g)
 
1665
        graph_thunk.add_node("D", ["A", "C"])
 
1666
        self.assertEqual(['B', 'D'],
 
1667
            sorted(graph_thunk.heads(['D', 'B', 'A'])))
 
1668
 
 
1669
    def test_merge_sort(self):
 
1670
        d = {('C',):[('A',)], ('B',): [('A',)], ('A',): []}
 
1671
        g = _mod_graph.KnownGraph(d)
 
1672
        graph_thunk = _mod_graph.GraphThunkIdsToKeys(g)
 
1673
        graph_thunk.add_node("D", ["A", "C"])
 
1674
        self.assertEqual([('C', 0, (2,), False), ('A', 0, (1,), True)],
 
1675
            [(n.key, n.merge_depth, n.revno, n.end_of_merge)
 
1676
                 for n in graph_thunk.merge_sort('C')])
 
1677
 
 
1678
 
 
1679
class TestStackedParentsProvider(tests.TestCase):
 
1680
 
 
1681
    def setUp(self):
 
1682
        super(TestStackedParentsProvider, self).setUp()
 
1683
        self.calls = []
 
1684
 
 
1685
    def get_shared_provider(self, info, ancestry, has_cached):
 
1686
        pp = _mod_graph.DictParentsProvider(ancestry)
 
1687
        if has_cached:
 
1688
            pp.get_cached_parent_map = pp.get_parent_map
 
1689
        return SharedInstrumentedParentsProvider(pp, self.calls, info)
 
1690
 
 
1691
    def test_stacked_parents_provider(self):
 
1692
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
 
1693
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
 
1694
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
 
1695
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
 
1696
                         stacked.get_parent_map(['rev1', 'rev2']))
 
1697
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
 
1698
                         stacked.get_parent_map(['rev2', 'rev1']))
 
1699
        self.assertEqual({'rev2':['rev3']},
 
1700
                         stacked.get_parent_map(['rev2', 'rev2']))
 
1701
        self.assertEqual({'rev1':['rev4']},
 
1702
                         stacked.get_parent_map(['rev1', 'rev1']))
 
1703
 
 
1704
    def test_stacked_parents_provider_overlapping(self):
 
1705
        # rev2 is availible in both providers.
 
1706
        # 1
 
1707
        # |
 
1708
        # 2
 
1709
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
 
1710
        parents2 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
 
1711
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
 
1712
        self.assertEqual({'rev2': ['rev1']},
 
1713
                         stacked.get_parent_map(['rev2']))
 
1714
 
 
1715
    def test_handles_no_get_cached_parent_map(self):
 
1716
        # this shows that we both handle when a provider doesn't implement
 
1717
        # get_cached_parent_map
 
1718
        pp1 = self.get_shared_provider('pp1', {'rev2': ('rev1',)},
 
1719
                                       has_cached=False)
 
1720
        pp2 = self.get_shared_provider('pp2', {'rev2': ('rev1',)},
 
1721
                                       has_cached=True)
 
1722
        stacked = _mod_graph.StackedParentsProvider([pp1, pp2])
 
1723
        self.assertEqual({'rev2': ('rev1',)}, stacked.get_parent_map(['rev2']))
 
1724
        # No call on 'pp1' because it doesn't provide get_cached_parent_map
 
1725
        self.assertEqual([('pp2', 'cached', ['rev2'])], self.calls)
 
1726
 
 
1727
    def test_query_order(self):
 
1728
        # We should call get_cached_parent_map on all providers before we call
 
1729
        # get_parent_map. Further, we should track what entries we have found,
 
1730
        # and not re-try them.
 
1731
        pp1 = self.get_shared_provider('pp1', {'a': ()}, has_cached=True)
 
1732
        pp2 = self.get_shared_provider('pp2', {'c': ('b',)}, has_cached=False)
 
1733
        pp3 = self.get_shared_provider('pp3', {'b': ('a',)}, has_cached=True)
 
1734
        stacked = _mod_graph.StackedParentsProvider([pp1, pp2, pp3])
 
1735
        self.assertEqual({'a': (), 'b': ('a',), 'c': ('b',)},
 
1736
                         stacked.get_parent_map(['a', 'b', 'c', 'd']))
 
1737
        self.assertEqual([('pp1', 'cached', ['a', 'b', 'c', 'd']),
 
1738
                          # No call to pp2, because it doesn't have cached
 
1739
                          ('pp3', 'cached', ['b', 'c', 'd']),
 
1740
                          ('pp1', ['c', 'd']),
 
1741
                          ('pp2', ['c', 'd']),
 
1742
                          ('pp3', ['d']),
 
1743
                         ], self.calls)