← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_has_same_location.py
17
17
"""Tests for implementations of Repository.has_same_location."""
18
18
 
19
19
from bzrlib import (
20
 
    controldir,
 
20
    bzrdir,
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 = controldir.ControlDir.open(self.get_vfs_only_url('other'))
 
122
        other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other'))
123
123
        other_repo = other_bzrdir.open_repository()
124
124
        self.assertDifferentRepo(repo, other_repo)
125
125