← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/test_fetch.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
27
27
from bzrlib.errors import (
28
28
    NoSuchRevision,
29
29
    )
30
 
from bzrlib.vf_search import (
 
30
from bzrlib.graph import (
31
31
    SearchResult,
32
32
    )
33
33
from bzrlib.revision import (
77
77
            self.addCleanup(tree.unlock)
78
78
            tree.get_file_text('file1')
79
79
            for file_id in tree.all_file_ids():
80
 
                if tree.kind(file_id) == "file":
 
80
                if tree.inventory[file_id].kind == "file":
81
81
                    tree.get_file(file_id).read()
82
82
 
83
83
        # makes a target version repo
234
234
        (stacked_left_tree,
235
235
         stacked_right_tree) = stacked_branch.repository.revision_trees(
236
236
            ['left', 'right'])
237
 
        self.assertEqual(
238
 
            left_tree.inventory, stacked_left_tree.inventory)
239
 
        self.assertEqual(
240
 
            right_tree.inventory, stacked_right_tree.inventory)
 
237
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
 
238
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
241
239
 
242
240
        # Finally, it's not enough to see that the basis inventories are
243
241
        # present.  The texts introduced in merge (and only those) should be
298
296
        stacked_branch.lock_read()
299
297
        self.addCleanup(stacked_branch.unlock)
300
298
        stacked_second_tree = stacked_branch.repository.revision_tree('second')
301
 
        self.assertEqual(second_tree.inventory,
302
 
            stacked_second_tree.inventory)
 
299
        self.assertEqual(second_tree.inventory, stacked_second_tree.inventory)
303
300
        # Finally, it's not enough to see that the basis inventories are
304
301
        # present.  The texts introduced in merge (and only those) should be
305
302
        # present, and also generating a stream should succeed without blowing
383
380
        (stacked_left_tree,
384
381
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
385
382
            ['left', 'right'])
386
 
        self.assertEqual(left_tree.inventory,
387
 
                stacked_left_tree.inventory)
388
 
        self.assertEqual(right_tree.inventory,
389
 
                stacked_right_tree.inventory)
 
383
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
 
384
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
390
385
        # Finally, it's not enough to see that the basis inventories are
391
386
        # present.  The texts introduced in merge (and only those) should be
392
387
        # present, and also generating a stream should succeed without blowing