~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

  • Committer: Jelmer Vernooij
  • Date: 2009-09-25 10:22:44 UTC
  • mto: This revision was merged to the branch mainline in revision 4719.
  • Revision ID: jelmer@samba.org-20090925102244-kl7gpoa4x4tl5k7r
Remove --default-rich-root argument in user-guide - the default format is now rich-root-enabled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
285
285
        self.lockable = self.get_lockable()
286
286
        self.lockable.create_lock()
287
287
 
288
 
    def stop_server(self):
289
 
        super(TestLockableFiles_TransportLock, self).stop_server()
 
288
    def tearDown(self):
 
289
        super(TestLockableFiles_TransportLock, self).tearDown()
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: