← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.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_selftest.py
624
624
    def test_get_readonly_url_none(self):
625
625
        from bzrlib.transport import get_transport
626
626
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
627
 
        self.vfs_transport_factory = test_server.MemoryServer
 
627
        self.vfs_transport_factory = memory.MemoryServer
628
628
        self.transport_readonly_server = None
629
629
        # calling get_readonly_transport() constructs a decorator on the url
630
630
        # for the server
677
677
 
678
678
    def setUp(self):
679
679
        super(TestTestCaseTransports, self).setUp()
680
 
        self.vfs_transport_factory = test_server.MemoryServer
 
680
        self.vfs_transport_factory = memory.MemoryServer
681
681
 
682
682
    def test_make_bzrdir_preserves_transport(self):
683
683
        t = self.get_transport()
1469
1469
        # permitted.
1470
1470
        # Manually set one up (TestCase doesn't and shouldn't provide magic
1471
1471
        # machinery)
1472
 
        transport_server = test_server.MemoryServer()
 
1472
        transport_server = memory.MemoryServer()
1473
1473
        transport_server.start_server()
1474
1474
        self.addCleanup(transport_server.stop_server)
1475
1475
        t = transport.get_transport(transport_server.get_url())
1557
1557
            result.calls)
1558
1558
 
1559
1559
    def test_start_server_registers_url(self):
1560
 
        transport_server = test_server.MemoryServer()
 
1560
        transport_server = memory.MemoryServer()
1561
1561
        # A little strict, but unlikely to be changed soon.
1562
1562
        self.assertEqual([], self._bzr_selftest_roots)
1563
1563
        self.start_server(transport_server)
1950
1950
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
1951
1951
 
1952
1952
    def test_transport_memory(self):
1953
 
        self.check_transport_set(test_server.MemoryServer)
 
1953
        self.check_transport_set(memory.MemoryServer)
1954
1954
 
1955
1955
 
1956
1956
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
2621
2621
        # Running bzr in blackbox mode, normal/expected/user errors should be
2622
2622
        # caught in the regular way and turned into an error message plus exit
2623
2623
        # code.
2624
 
        transport_server = test_server.MemoryServer()
 
2624
        transport_server = memory.MemoryServer()
2625
2625
        transport_server.start_server()
2626
2626
        self.addCleanup(transport_server.stop_server)
2627
2627
        url = transport_server.get_url()