← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_graph.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

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
700
699
        self.assertEqual({'rev2': ['rev1']},
701
700
                         stacked.get_parent_map(['rev2']))
702
701
 
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
702
    def test_iter_topo_order(self):
718
703
        graph = self.make_graph(ancestry_1)
719
704
        args = ['rev2a', 'rev3', 'rev1']
1424
1409
        self.assertMergeOrder(['rev3', 'rev1'], graph, 'rev4', ['rev1', 'rev3'])
1425
1410
 
1426
1411
 
 
1412
class TestFindDescendants(TestGraphBase):
 
1413
 
 
1414
    def test_find_descendants_rev1_rev3(self):
 
1415
        graph = self.make_graph(ancestry_1)
 
1416
        descendants = graph.find_descendants('rev1', 'rev3')
 
1417
        self.assertEqual(set(['rev1', 'rev2a', 'rev3']), descendants)
 
1418
 
 
1419
    def test_find_descendants_rev1_rev4(self):
 
1420
        graph = self.make_graph(ancestry_1)
 
1421
        descendants = graph.find_descendants('rev1', 'rev4')
 
1422
        self.assertEqual(set(['rev1', 'rev2a', 'rev2b', 'rev3', 'rev4']),
 
1423
                         descendants)
 
1424
 
 
1425
    def test_find_descendants_rev2a_rev4(self):
 
1426
        graph = self.make_graph(ancestry_1)
 
1427
        descendants = graph.find_descendants('rev2a', 'rev4')
 
1428
        self.assertEqual(set(['rev2a', 'rev3', 'rev4']), descendants)
 
1429
 
 
1430
class TestFindLefthandMerger(TestGraphBase):
 
1431
 
 
1432
    def check_merger(self, result, ancestry, merged, tip):
 
1433
        graph = self.make_graph(ancestry)
 
1434
        self.assertEqual(result, graph.find_lefthand_merger(merged, tip))
 
1435
 
 
1436
    def test_find_lefthand_merger_rev2b(self):
 
1437
        self.check_merger('rev4', ancestry_1, 'rev2b', 'rev4')
 
1438
 
 
1439
    def test_find_lefthand_merger_rev2a(self):
 
1440
        self.check_merger('rev2a', ancestry_1, 'rev2a', 'rev4')
 
1441
 
 
1442
    def test_find_lefthand_merger_rev4(self):
 
1443
        self.check_merger(None, ancestry_1, 'rev4', 'rev2a')
 
1444
 
 
1445
    def test_find_lefthand_merger_f(self):
 
1446
        self.check_merger('i', complex_shortcut, 'f', 'm')
 
1447
 
 
1448
    def test_find_lefthand_merger_g(self):
 
1449
        self.check_merger('i', complex_shortcut, 'g', 'm')
 
1450
 
 
1451
    def test_find_lefthand_merger_h(self):
 
1452
        self.check_merger('n', complex_shortcut, 'h', 'n')
 
1453
 
 
1454
 
 
1455
class TestGetChildMap(TestGraphBase):
 
1456
 
 
1457
    def test_get_child_map(self):
 
1458
        graph = self.make_graph(ancestry_1)
 
1459
        child_map = graph.get_child_map(['rev4', 'rev3', 'rev2a', 'rev2b'])
 
1460
        self.assertEqual({'rev1': ['rev2a', 'rev2b'],
 
1461
                          'rev2a': ['rev3'],
 
1462
                          'rev2b': ['rev4'],
 
1463
                          'rev3': ['rev4']},
 
1464
                          child_map)
 
1465
 
 
1466
 
1427
1467
class TestCachingParentsProvider(tests.TestCase):
1428
1468
    """These tests run with:
1429
1469
 
1599
1639
        self.assertEqual(['D'], sorted(graph_thunk.heads(['D', 'C'])))
1600
1640
        self.assertEqual(['B', 'C'], sorted(graph_thunk.heads(['B', 'C'])))
1601
1641
 
 
1642
    def test_add_node(self):
 
1643
        d = {('C',):[('A',)], ('B',): [('A',)], ('A',): []}
 
1644
        g = _mod_graph.KnownGraph(d)
 
1645
        graph_thunk = _mod_graph.GraphThunkIdsToKeys(g)
 
1646
        graph_thunk.add_node("D", ["A", "C"])
 
1647
        self.assertEqual(['B', 'D'],
 
1648
            sorted(graph_thunk.heads(['D', 'B', 'A'])))
 
1649
 
1602
1650
 
1603
1651
class TestPendingAncestryResultGetKeys(TestCaseWithMemoryTransport):
1604
1652
    """Tests for bzrlib.graph.PendingAncestryResult."""