~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Various hopefully improvements, but wsgi is broken, handing over to spiv :).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1452
1452
            # they may not be initializable.
1453
1453
            return
1454
1454
        # supported formats must be able to init and open
1455
 
        url = self.get_url('subdir')
1456
 
        get_transport(self.get_url()).mkdir('subdir')
1457
 
        made_control = self.bzrdir_format.initialize(url)
 
1455
        # - do the vfs initialisation over the basic vfs transport
 
1456
        # XXX: TODO this should become a 'bzrdirlocation' api call.
 
1457
        url = self.get_vfs_only_url('subdir')
 
1458
        get_transport(self.get_vfs_only_url()).mkdir('subdir')
 
1459
        made_control = self.bzrdir_format.initialize(self.get_url('subdir'))
1458
1460
        try:
1459
1461
            repo = made_control.open_repository()
1460
1462
            # if there is a repository, then the format cannot ever hit this 
1462
1464
            return
1463
1465
        except errors.NoRepositoryPresent:
1464
1466
            pass
1465
 
        opened_control = bzrdir.BzrDir.open(self.get_readonly_url('subdir'))
 
1467
        made_control = bzrdir.BzrDir.open(self.get_readonly_url('subdir'))
1466
1468
        self.assertRaises(errors.NoRepositoryPresent,
1467
 
                          opened_control.find_repository)
 
1469
                          made_control.find_repository)
1468
1470