← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-27 17:53:08 UTC
  • mfrom: (5390 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5393.
  • Revision ID: john@arbash-meinel.com-20100827175308-qsvcc11dkfvkrny1
Merge bzr.dev 5390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
30
30
    branch,
31
31
    bzrdir,
32
32
    config,
 
33
    controldir,
33
34
    errors,
34
35
    graph,
35
36
    inventory,
36
37
    inventory_delta,
37
 
    pack,
38
38
    remote,
39
39
    repository,
40
40
    tests,
41
41
    transport,
42
42
    treebuilder,
43
 
    urlutils,
44
43
    versionedfile,
45
44
    )
46
45
from bzrlib.branch import Branch
47
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat
 
46
from bzrlib.bzrdir import (
 
47
    BzrDir,
 
48
    BzrDirFormat,
 
49
    RemoteBzrProber,
 
50
    )
48
51
from bzrlib.remote import (
49
52
    RemoteBranch,
50
53
    RemoteBranchFormat,
51
54
    RemoteBzrDir,
52
 
    RemoteBzrDirFormat,
53
55
    RemoteRepository,
54
56
    RemoteRepositoryFormat,
55
57
    )
119
121
    def test_find_correct_format(self):
120
122
        """Should open a RemoteBzrDir over a RemoteTransport"""
121
123
        fmt = BzrDirFormat.find_format(self.transport)
122
 
        self.assertTrue(RemoteBzrDirFormat
123
 
                        in BzrDirFormat._control_server_formats)
 
124
        self.assertTrue(bzrdir.RemoteBzrProber
 
125
                        in controldir.ControlDirFormat._server_probers)
124
126
        self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
125
127
 
126
128
    def test_open_detected_smart_format(self):
683
685
        old.
684
686
        """
685
687
        self.assertRaises(errors.NotBranchError,
686
 
            RemoteBzrDirFormat.probe_transport, OldServerTransport())
 
688
            RemoteBzrProber.probe_transport, OldServerTransport())
687
689
 
688
690
 
689
691
class TestBzrDirCreateBranch(TestRemote):