← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-10 16:11:31 UTC
  • mto: (5712.4.8 bzrdir-weave)
  • mto: This revision was merged to the branch mainline in revision 5716.
  • Revision ID: jelmer@samba.org-20110310161131-pi4vny9un1iamo8h
Remove unused register format functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
26
26
    errors,
27
27
    gpg,
28
28
    osutils,
29
 
    repository,
30
29
    transport,
31
30
    ui,
32
31
    urlutils,
46
45
    )
47
46
from bzrlib.remote import (
48
47
    RemoteBzrDir,
 
48
    RemoteBzrDirFormat,
49
49
    RemoteRepository,
50
50
    )
51
51
 
1068
1068
        self.assertIsInstance(control, controldir.ControlDir)
1069
1069
        opened = bzrdir.BzrDir.open(t.base)
1070
1070
        expected_format = self.bzrdir_format
1071
 
        if isinstance(expected_format, bzrdir.RemoteBzrDirFormat):
 
1071
        if isinstance(expected_format, RemoteBzrDirFormat):
1072
1072
            # Current RemoteBzrDirFormat's do not reliably get network_name
1073
1073
            # set, so we skip a number of tests for RemoteBzrDirFormat's.
1074
1074
            self.assertIsInstance(control, RemoteBzrDir)
1093
1093
        # key in the registry gives back the same format. For remote obects
1094
1094
        # we check that the network_name of the RemoteBzrDirFormat we have
1095
1095
        # locally matches the actual format present on disk.
1096
 
        if isinstance(format, bzrdir.RemoteBzrDirFormat):
 
1096
        if isinstance(format, RemoteBzrDirFormat):
1097
1097
            dir._ensure_real()
1098
1098
            real_dir = dir._real_bzrdir
1099
1099
            network_name = format.network_name()