/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lock.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-31 16:51:48 UTC
  • mto: This revision was merged to the branch mainline in revision 4611.
  • Revision ID: john@arbash-meinel.com-20090731165148-fg37wo885ppjp4we
Fix the direct lock tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lock.py
76
76
        try:
77
77
            if lock.have_fcntl and self.write_lock is lock._fcntl_WriteLock:
78
78
                # With -Dlock, fcntl locks are properly exclusive
79
 
                debug.debug_flags.add('strict-locks')
 
79
                debug.debug_flags.add('strict_locks')
80
80
                self.assertRaises(errors.LockContention,
81
81
                                  self.write_lock, 'a-lock-file')
82
82
                # But not without it
83
 
                debug.debug_flags.remove('strict-locks')
 
83
                debug.debug_flags.remove('strict_locks')
84
84
                try:
85
85
                    w_lock = self.write_lock('a-lock-file')
86
86
                except errors.LockContention:
101
101
        try:
102
102
            if lock.have_fcntl and self.read_lock is lock._fcntl_ReadLock:
103
103
                # With -Dlock, fcntl locks are properly exclusive
104
 
                debug.debug_flags.add('strict-locks')
 
104
                debug.debug_flags.add('strict_locks')
105
105
                self.assertRaises(errors.LockContention,
106
106
                                  self.read_lock, 'a-lock-file')
107
107
                # But not without it
108
 
                debug.debug_flags.remove('strict-locks')
 
108
                debug.debug_flags.remove('strict_locks')
109
109
                try:
110
110
                    r_lock = self.read_lock('a-lock-file')
111
111
                except errors.LockContention: