/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

merge bzr.dev into cleanup

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
1232
1235
            return
1233
1236
        self.assertNotEqual(repo.bzrdir.root_transport.base,
1234
1237
            made_repo.bzrdir.root_transport.base)
1235
 
        # New repositories are write locked.
1236
 
        self.assertTrue(made_repo.is_write_locked())
1237
 
        made_repo.unlock()
1238
1238
 
1239
1239
    def test_format_initialize_on_transport_ex_force_new_repo_False(self):
1240
1240
        t = self.get_transport('repo')
1267
1267
            # uninitialisable format
1268
1268
            return
1269
1269
        self.assertLength(1, repo._fallback_repositories)
1270
 
        # New repositories are write locked.
1271
 
        self.assertTrue(repo.is_write_locked())
1272
 
        repo.unlock()
1273
1270
 
1274
1271
    def test_format_initialize_on_transport_ex_default_stack_on(self):
1275
1272
        # When initialize_on_transport_ex uses a stacked-on branch because of
1292
1289
        repo_name = repo_fmt.repository_format.network_name()
1293
1290
        repo, control = self.assertInitializeEx(
1294
1291
            t, need_meta=True, repo_format_name=repo_name, stacked_on=None)
 
1292
        # self.addCleanup(repo.unlock)
1295
1293
        if control is None:
1296
1294
            # uninitialisable format
1297
1295
            return
1323
1321
            # must stay with the all-in-one-format.
1324
1322
            repo_name = self.bzrdir_format.network_name()
1325
1323
        self.assertEqual(repo_name, repo._format.network_name())
1326
 
        # New repositories are write locked.
1327
 
        self.assertTrue(repo.is_write_locked())
1328
 
        repo.unlock()
1329
1324
 
1330
1325
    def assertInitializeEx(self, t, need_meta=False, **kwargs):
1331
1326
        """Execute initialize_on_transport_ex and check it succeeded correctly.
1343
1338
            return None, None
1344
1339
        repo, control, require_stacking, repo_policy = \
1345
1340
            self.bzrdir_format.initialize_on_transport_ex(t, **kwargs)
 
1341
        if repo is not None:
 
1342
            # Repositories are open write-locked
 
1343
            self.assertTrue(repo.is_write_locked())
 
1344
            self.addCleanup(repo.unlock)
1346
1345
        self.assertIsInstance(control, bzrdir.BzrDir)
1347
1346
        opened = bzrdir.BzrDir.open(t.base)
1348
1347
        expected_format = self.bzrdir_format