← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

  • Committer: Patch Queue Manager
  • Date: 2012-09-05 20:52:26 UTC
  • mfrom: (6549.3.1 dev_2.5_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20120905205226-8s3bzolvduug3ifj
(gz) Merge 2.5 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
433
433
        self.assertContainsRe(info_list['time_ago'], r'^\d+ seconds? ago$')
434
434
 
435
435
    def test_lock_without_email(self):
436
 
        global_config = config.GlobalConfig()
 
436
        global_config = config.GlobalStack()
437
437
        # Intentionally has no email address
438
 
        global_config.set_user_option('email', 'User Identity')
 
438
        global_config.set('email', 'User Identity')
439
439
        ld1 = self.get_lock()
440
440
        ld1.create()
441
441
        ld1.lock_write()
734
734
            lambda: 'aproperhostname')
735
735
        # This is off by default at present; see the discussion in the bug.
736
736
        # If you change the default, don't forget to update the docs.
737
 
        config.GlobalConfig().set_user_option('locks.steal_dead', True)
 
737
        config.GlobalStack().set('locks.steal_dead', True)
738
738
        # Create a lock pretending to come from a different nonexistent
739
739
        # process on the same machine.
740
740
        l1 = LockDir(self.get_transport(), 'a',