← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.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/per_branch/test_branch.py
35
35
from bzrlib.tests import (
36
36
    http_server,
37
37
    per_branch,
38
 
    test_server,
39
38
    )
40
39
from bzrlib.tests.http_server import HttpServer
 
40
from bzrlib.transport import memory
41
41
 
42
42
 
43
43
class TestTestCaseWithBranch(per_branch.TestCaseWithBranch):
512
512
 
513
513
    def setUp(self):
514
514
        super(ChrootedTests, self).setUp()
515
 
        if not self.vfs_transport_factory == test_server.MemoryServer:
 
515
        if not self.vfs_transport_factory == memory.MemoryServer:
516
516
            self.transport_readonly_server = HttpServer
517
517
 
518
518
    def test_open_containing(self):