← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_mkdir.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_mkdir.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
"""Tests for interface conformance of 'workingtree.put_mkdir'"""
19
19
 
24
24
 
25
25
    def test_mkdir_no_id(self):
26
26
        t = self.make_branch_and_tree('t1')
 
27
        t.lock_write()
 
28
        self.addCleanup(t.unlock)
27
29
        file_id = t.mkdir('path')
28
30
        self.assertEqual('directory', t.kind(file_id))
29
31
 
30
32
    def test_mkdir_with_id(self):
31
33
        t = self.make_branch_and_tree('t1')
 
34
        t.lock_write()
 
35
        self.addCleanup(t.unlock)
32
36
        file_id = t.mkdir('path', 'my-id')
33
37
        self.assertEqual('my-id', file_id)
34
38
        self.assertEqual('directory', t.kind(file_id))