~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/lock_helpers.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-02 20:32:50 UTC
  • mto: (4679.6.1 2.1-export-c-api)
  • mto: This revision was merged to the branch mainline in revision 4735.
  • Revision ID: john@arbash-meinel.com-20091002203250-q6iv6o2mwjqp4g53
Add __iter__ support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Helper functions/classes for testing locking"""
18
18
 
44
44
        self.__dict__['_allow_read'] = True
45
45
        self.__dict__['_allow_unlock'] = True
46
46
 
 
47
    def __eq__(self, other):
 
48
        # Branch objects look for controlfiles == repo.controlfiles.
 
49
        if type(other) is LockWrapper:
 
50
            return self._other == other._other
 
51
        return False
 
52
 
47
53
    def __getattr__(self, attr):
48
54
        return getattr(self._other, attr)
49
55
 
56
62
            return self._other.lock_read()
57
63
        raise TestPreventLocking('lock_read disabled')
58
64
 
59
 
    def lock_write(self):
 
65
    def lock_write(self, token=None):
60
66
        self._sequence.append((self._other_id, 'lw', self._allow_write))
61
67
        if self._allow_write:
62
68
            return self._other.lock_write()