/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_commit.py

  • Committer: John Arbash Meinel
  • Date: 2008-03-20 16:24:32 UTC
  • mfrom: (3298 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3299.
  • Revision ID: john@arbash-meinel.com-20080320162432-whjl8nhp3b5q0dj0
[merge] bzr.dev 3298, clean up NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 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
444
444
        bound = master.sprout('bound')
445
445
        wt = bound.open_workingtree()
446
446
        wt.branch.set_bound_location(os.path.realpath('master'))
447
 
 
448
 
        orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
449
447
        master_branch.lock_write()
450
448
        try:
451
 
            lockdir._DEFAULT_TIMEOUT_SECONDS = 1
452
449
            self.assertRaises(LockContention, wt.commit, 'silly')
453
450
        finally:
454
 
            lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
455
451
            master_branch.unlock()
456
452
 
457
453
    def test_commit_bound_merge(self):