/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/tests/test_lockable_files.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-18 21:41:08 UTC
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090818214108-03e6hkoj7v4va7x8
Turns out that some code assumed passing NULL_REVISION to merge_sort
always was fine, and now that we are using 'keys' it was passing (NULL_REVISION,)
for now, that should be ok.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
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: