← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-22 15:44:21 UTC
  • mfrom: (5171.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100422154421-eeit8sxsvtxxherb
(vila) Merge 2.2 into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
303
303
        self.assertEqual(
304
304
            'method_with_tree_write_lock',
305
305
            tree.method_with_tree_write_lock.__name__)
306
 
        self.assertDocstring(
 
306
        self.assertEqual(
307
307
            "A lock_tree_write decorated method that returns its arguments.",
308
 
            tree.method_with_tree_write_lock)
 
308
            tree.method_with_tree_write_lock.__doc__)
309
309
        args = (1, 2, 3)
310
310
        kwargs = {'a':'b'}
311
311
        result = tree.method_with_tree_write_lock(1,2,3, a='b')