/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

  • Committer: Martin Pool
  • Date: 2009-11-26 01:42:06 UTC
  • mfrom: (4827 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4828.
  • Revision ID: mbp@sourcefrog.net-20091126014206-qvf8jfpwpro558r4
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
778
778
                                     './.bzr/repository/inventory.knit',
779
779
                                     ])
780
780
        try:
 
781
            local_inventory = dir.transport.local_abspath('inventory')
 
782
        except errors.NotLocalUrl:
 
783
            return
 
784
        try:
781
785
            # If we happen to have a tree, we'll guarantee everything
782
786
            # except for the tree root is the same.
783
 
            inventory_f = file(dir.transport.base+'inventory', 'rb')
 
787
            inventory_f = file(local_inventory, 'rb')
 
788
            self.addCleanup(inventory_f.close)
784
789
            self.assertContainsRe(inventory_f.read(),
785
 
                                  '<inventory file_id="TREE_ROOT[^"]*"'
786
 
                                  ' format="5">\n</inventory>\n')
787
 
            inventory_f.close()
 
790
                                  '<inventory format="5">\n</inventory>\n')
788
791
        except IOError, e:
789
792
            if e.errno != errno.ENOENT:
790
793
                raise