← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_lock/test_lock.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-27 20:08:36 UTC
  • mfrom: (5447.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20100927200836-asjq41qt5fol30df
(vila) Merge lp:bzr/2.2 into trunk including fixes for #644855,
        #646133, #632387 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_lock/test_lock.py
21
21
    osutils,
22
22
    )
23
23
 
24
 
from bzrlib.tests import UnicodeFilenameFeature
 
24
from bzrlib.tests import (features, UnicodeFilenameFeature)
25
25
from bzrlib.tests.per_lock import TestCaseWithLock
26
26
 
27
27
 
63
63
 
64
64
        But we shouldn't be able to take a write lock.
65
65
        """
 
66
        self.requireFeature(features.not_running_as_root)
66
67
        osutils.make_readonly('a-file')
67
68
        # Make sure the file is read-only (on all platforms)
68
69
        self.assertRaises(IOError, open, 'a-file', 'rb+')