← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.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/__init__.py
101
101
    deprecated_passed,
102
102
    )
103
103
import bzrlib.trace
104
 
from bzrlib.transport import get_transport, pathfilter
 
104
from bzrlib.transport import (
 
105
    get_transport,
 
106
    memory,
 
107
    pathfilter,
 
108
    )
105
109
import bzrlib.transport
106
110
from bzrlib.trace import mutter, note
107
111
from bzrlib.tests import (
2205
2209
        is no means to override it.
2206
2210
        """
2207
2211
        if self.__vfs_server is None:
2208
 
            self.__vfs_server = test_server.MemoryServer()
 
2212
            self.__vfs_server = memory.MemoryServer()
2209
2213
            self.start_server(self.__vfs_server)
2210
2214
        return self.__vfs_server
2211
2215
 
2686
2690
 
2687
2691
    def setUp(self):
2688
2692
        super(ChrootedTestCase, self).setUp()
2689
 
        if not self.vfs_transport_factory == test_server.MemoryServer:
 
2693
        if not self.vfs_transport_factory == memory.MemoryServer:
2690
2694
            self.transport_readonly_server = HttpServer
2691
2695
 
2692
2696