/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-11 07:14:58 UTC
  • mto: (4350.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4354.
  • Revision ID: v.ladeuil+lp@free.fr-20090511071458-bjghkrcdxbv87193
Fix 2 more lock-related test failures.

* tests/test_lockable_files.py:
Replace some try/finally with an addCleanup().
(_TestLockableFiles_mixin.test_leave_in_place): Restore clearing
lock behavior.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
601
601
    """Return (transport, server) permutations for testing."""
602
602
    ### We may need a little more test framework support to construct an
603
603
    ### appropriate RemoteTransport in the future.
604
 
    from bzrlib.tests import test_server
605
 
    return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)]
 
604
    from bzrlib.smart import server
 
605
    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]