← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
48
48
    server,
49
49
    vfs,
50
50
    )
51
 
from bzrlib.tests import test_server
52
51
from bzrlib.transport import (
53
52
    chroot,
 
53
    local,
54
54
    memory,
55
55
    )
56
56
 
106
106
        self.transport_server = self.make_transport_server
107
107
 
108
108
    def make_transport_server(self):
109
 
        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
109
        return server.SmartTCPServer_for_testing('-' + self.id())
110
110
 
111
111
    def get_smart_medium(self):
112
112
        """Get a smart medium to use in tests."""
214
214
        dir = self.make_bzrdir('.')
215
215
        local_result = dir.cloning_metadir()
216
216
        reference = _mod_branch.BranchReferenceFormat().initialize(
217
 
            dir, target_branch=referenced_branch)
 
217
            dir, referenced_branch)
218
218
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
219
219
        # The server shouldn't try to follow the branch reference, so it's fine
220
220
        # if the referenced branch isn't reachable.
489
489
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
490
490
 
491
491
    def test_present_with_workingtree(self):
492
 
        self.vfs_transport_factory = test_server.LocalURLServer
 
492
        self.vfs_transport_factory = local.LocalURLServer
493
493
        backing = self.get_transport()
494
494
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
495
495
        bd = self.make_bzrdir('.')
520
520
 
521
521
    def test_branch_reference(self):
522
522
        """When there is a branch reference, the reference URL is returned."""
523
 
        self.vfs_transport_factory = test_server.LocalURLServer
 
523
        self.vfs_transport_factory = local.LocalURLServer
524
524
        backing = self.get_transport()
525
525
        request = smart_dir.SmartServerRequestOpenBranch(backing)
526
526
        branch = self.make_branch('branch')
561
561
 
562
562
    def test_branch_reference(self):
563
563
        """When there is a branch reference, the reference URL is returned."""
564
 
        self.vfs_transport_factory = test_server.LocalURLServer
 
564
        self.vfs_transport_factory = local.LocalURLServer
565
565
        backing = self.get_transport()
566
566
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
567
567
        branch = self.make_branch('branch')
624
624
 
625
625
    def test_branch_reference(self):
626
626
        """When there is a branch reference, the reference URL is returned."""
627
 
        self.vfs_transport_factory = test_server.LocalURLServer
 
627
        self.vfs_transport_factory = local.LocalURLServer
628
628
        backing = self.get_transport()
629
629
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
630
630
        branch = self.make_branch('branch')