~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport_implementations.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
142
142
        self.check_transport_contents('another contents\nfor d\n', t, 'd')
143
143
 
144
144
        self.assertRaises(NoSuchFile,
145
 
                          t.put, 'path/doesnt/exist/c', 'contents')
 
145
                          t.put, 'path/doesnt/exist/c', StringIO('contents'))
146
146
 
147
147
    def test_put_permissions(self):
148
148
        t = self.get_transport()
543
543
        t.mkdir('adir')
544
544
        t.mkdir('adir/bdir')
545
545
        t.rmdir('adir/bdir')
546
 
        self.assertRaises(NoSuchFile, t.stat, 'adir/bdir')
 
546
        self.assertRaises(PathError, t.rmdir, 'adir/bdir')
547
547
        t.rmdir('adir')
548
 
        self.assertRaises(NoSuchFile, t.stat, 'adir')
 
548
        self.assertRaises(PathError, t.rmdir, 'adir')
549
549
 
550
550
    def test_rmdir_not_empty(self):
551
551
        """Deleting a non-empty directory raises an exception