~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
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()