← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_transport.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:21:45 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092145-drh33z43szccfswy
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
40
40
        server,
41
41
        vfs,
42
42
)
43
 
from bzrlib.tests import (
44
 
    test_server,
45
 
    test_smart,
46
 
    )
 
43
from bzrlib.tests import test_smart
47
44
from bzrlib.transport import (
48
45
        http,
49
46
        local,
1002
999
        # tests wanting a server. The latter should be updated to use
1003
1000
        # self.vfs_transport_factory etc.
1004
1001
        if not backing_transport:
1005
 
            mem_server = test_server.MemoryServer()
 
1002
            mem_server = memory.MemoryServer()
1006
1003
            mem_server.start_server()
1007
1004
            self.addCleanup(mem_server.stop_server)
1008
1005
            self.permit_url(mem_server.get_url())