← Back to branch summary

~jelmer/bzr-loom/lp-pqm

« back to all changes in this revision

Viewing changes to tests/test_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-21 20:50:57 UTC
  • mfrom: (34.20.53 trunk)
  • mto: This revision was merged to the branch mainline in revision 52.
  • Revision ID: jelmer@samba.org-20111221205057-m65gvc689r9zd0aq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_tree.py
97
97
        tree_loom_tree = bzrlib.plugins.loom.tree.LoomTreeDecorator(tree)
98
98
        tree_loom_tree.down_thread()
99
99
        # check the test will be valid
100
 
        self.assertEqual([None, bottom_rev1, top_rev1],
101
 
            tree.branch.repository.get_ancestry(top_rev1))
102
 
        self.assertEqual([bottom_rev1], tree.get_parent_ids())
 
100
        tree.lock_read()
 
101
        try:
 
102
            graph = tree.branch.repository.get_graph()
 
103
            self.assertEqual([top_rev1, bottom_rev1, NULL_REVISION],
 
104
                [r for (r, ps) in graph.iter_ancestry([top_rev1])])
 
105
            self.assertEqual([bottom_rev1], tree.get_parent_ids())
 
106
        finally:
 
107
            tree.unlock()
103
108
        tree_loom_tree.up_thread()
104
109
        self.assertEqual('top', tree.branch.nick)
105
110
        self.assertEqual([top_rev1], tree.get_parent_ids())
116
121
        tree_loom_tree = bzrlib.plugins.loom.tree.LoomTreeDecorator(tree)
117
122
        tree_loom_tree.down_thread()
118
123
        # check the test will be valid
119
 
        self.assertEqual([None, bottom_rev1, top_rev1],
120
 
            tree.branch.repository.get_ancestry(top_rev1))
121
 
        self.assertEqual([bottom_rev1], tree.get_parent_ids())
 
124
        tree.lock_read()
 
125
        try:
 
126
            graph = tree.branch.repository.get_graph()
 
127
            self.assertEqual([top_rev1, bottom_rev1, NULL_REVISION],
 
128
                [r for (r, ps) in graph.iter_ancestry([top_rev1])])
 
129
            self.assertEqual([bottom_rev1], tree.get_parent_ids())
 
130
        finally:
 
131
            tree.unlock()
122
132
        bottom_rev2 = tree.commit('bottom_two', allow_pointless=True)
123
133
        tree_loom_tree.up_thread()
124
134
        self.assertEqual('top', tree.branch.nick)