← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
285
285
        self.lockable = self.get_lockable()
286
286
        self.lockable.create_lock()
287
287
 
288
 
    def tearDown(self):
289
 
        super(TestLockableFiles_TransportLock, self).tearDown()
 
288
    def stop_server(self):
 
289
        super(TestLockableFiles_TransportLock, self).stop_server()
290
290
        # free the subtransport so that we do not get a 5 second
291
291
        # timeout due to the SFTP connection cache.
292
292
        try: