← 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

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_lock/test_lock.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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+')