← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_break_lock.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_break_lock.py
70
70
 
71
71
    def test_break_lock_everything_locked(self):
72
72
        ### if everything is locked, we should be able to unlock the lot.
73
 
        # however, we dont test breaking the working tree because we 
74
 
        # cannot accurately do so right now: the dirstate lock is held 
 
73
        # however, we dont test breaking the working tree because we
 
74
        # cannot accurately do so right now: the dirstate lock is held
75
75
        # by an os lock, and we need to spawn a separate process to lock it
76
76
        # thne kill -9 it.
77
77
        # sketch of test:
85
85
        branch = bzrlib.branch.Branch.open('checkout')
86
86
        branch.lock_write()
87
87
        branch.unlock()
88
 
        # and a new instance of the master branch 
 
88
        # and a new instance of the master branch
89
89
        mb = branch.get_master_branch()
90
90
        mb.lock_write()
91
91
        mb.unlock()