← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_has_same_location.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_has_same_location.py
20
20
    bzrdir,
21
21
    transport,
22
22
    )
 
23
from bzrlib.remote import (
 
24
    RemoteRepositoryFormat,
 
25
    )
23
26
from bzrlib.tests import (
24
27
    TestNotApplicable,
25
28
    )
84
87
        CopyConverter creates a second repository in one bzrdir.
85
88
        """
86
89
        repo = self.make_repository('repo')
87
 
        try:
88
 
            control_transport = repo._transport
89
 
        except AttributeError:
90
 
            raise TestNotApplicable(
91
 
                "%r has no transport" % (repo,))
92
 
        if control_transport.base == repo.bzrdir.transport.base:
 
90
        if repo.control_transport.base == repo.bzrdir.control_transport.base:
93
91
            raise TestNotApplicable(
94
92
                "%r has repository files directly in the bzrdir"
95
93
                % (repo,))
96
94
            # This test only applies to repository formats where the repo
97
95
            # control_files are separate from other bzrdir files, i.e. metadir
98
96
            # formats.
99
 
        control_transport.copy_tree('.', '../repository.backup')
100
 
        backup_transport = control_transport.clone('../repository.backup')
101
 
        backup_repo = repo._format.open(repo.bzrdir, _found=True,
 
97
        repo.control_transport.copy_tree('.', '../repository.backup')
 
98
        backup_transport = repo.control_transport.clone('../repository.backup')
 
99
        if isinstance(repo._format, RemoteRepositoryFormat):
 
100
            raise TestNotApplicable("remote repositories don't support overriding "
 
101
                                    "transport")
 
102
        backup_repo = repo._format.open(repo.bzrdir,
102
103
                                        _override_transport=backup_transport)
103
104
        self.assertDifferentRepo(repo, backup_repo)
104
105
 
116
117
            # format for other_repo.
117
118
            transport.get_transport(self.get_vfs_only_url()
118
119
                                    ).delete_tree('other')
119
 
            other_repo = self.make_repository('other', format='metaweave')
 
120
            other_repo = self.make_repository('other', format='knit')
120
121
        # Make sure the other_repo is not a RemoteRepository.
121
122
        other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other'))
122
123
        other_repo = other_bzrdir.open_repository()