← 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: Andrew Bennetts
  • Date: 2010-08-05 04:21:03 UTC
  • mto: This revision was merged to the branch mainline in revision 5367.
  • Revision ID: andrew.bennetts@canonical.com-20100805042103-pdc01ltvca2nu7bl
Fix test failures for bundles and upgrades.

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