← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_bound_sftp.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_bound_sftp.py
1
 
# Copyright (C) 2005 Robey Pointer <robey@lag.net>, Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Robey Pointer <robey@lag.net>, Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
25
25
    errors,
26
26
    tests,
27
27
    )
28
 
from bzrlib.transport.local import LocalURLServer
29
 
from bzrlib.transport.memory import MemoryServer
 
28
from bzrlib.tests import test_server
 
29
from bzrlib.transport import memory
30
30
 
31
31
 
32
32
class BoundSFTPBranch(tests.TestCaseWithTransport):
33
33
 
34
34
    def setUp(self):
35
35
        tests.TestCaseWithTransport.setUp(self)
36
 
        self.vfs_transport_factory = MemoryServer
37
 
        if self.transport_server is LocalURLServer:
 
36
        self.vfs_transport_factory = memory.MemoryServer
 
37
        if self.transport_server is test_server.LocalURLServer:
38
38
            self.transport_server = None
39
39
 
40
40
    def create_branches(self):