~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: Patch Queue Manager
  • Date: 2012-03-06 19:49:19 UTC
  • mfrom: (6472.2.6 use-bzr-controldir)
  • Revision ID: pqm@pqm.ubuntu.com-20120306194919-kt7mj6xmhifsgees
(jelmer) Use bzrlib.controldir for generic access to control directories,
 rather than bzrlib.bzrdir. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
"""Tests for implementations of Repository.has_same_location."""
18
18
 
19
19
from bzrlib import (
20
 
    bzrdir,
 
20
    controldir,
21
21
    transport,
22
22
    )
23
23
from bzrlib.remote import (
119
119
                self.get_vfs_only_url()).delete_tree('other')
120
120
            other_repo = self.make_repository('other', format='knit')
121
121
        # Make sure the other_repo is not a RemoteRepository.
122
 
        other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other'))
 
122
        other_bzrdir = controldir.ControlDir.open(self.get_vfs_only_url('other'))
123
123
        other_repo = other_bzrdir.open_repository()
124
124
        self.assertDifferentRepo(repo, other_repo)
125
125