← 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: Jelmer Vernooij
  • Date: 2011-11-27 17:42:25 UTC
  • mto: This revision was merged to the branch mainline in revision 6311.
  • Revision ID: jelmer@samba.org-20111127174225-tspfeewl0gwxxumt
Add possible_transports in a couple more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
43
43
from bzrlib.tests import (
44
44
    features,
45
45
    TestCase,
46
 
    TestCaseInTempDir,
47
46
    TestCaseWithTransport,
48
47
    )
49
48
 
433
432
        self.assertContainsRe(info_list['time_ago'], r'^\d+ seconds? ago$')
434
433
 
435
434
    def test_lock_without_email(self):
436
 
        global_config = config.GlobalStack()
 
435
        global_config = config.GlobalConfig()
437
436
        # Intentionally has no email address
438
 
        global_config.set('email', 'User Identity')
 
437
        global_config.set_user_option('email', 'User Identity')
439
438
        ld1 = self.get_lock()
440
439
        ld1.create()
441
440
        ld1.lock_write()
655
654
        self.assertEqual([], self._calls)
656
655
 
657
656
 
658
 
class TestLockHeldInfo(TestCaseInTempDir):
 
657
class TestLockHeldInfo(TestCase):
659
658
    """Can get information about the lock holder, and detect whether they're
660
659
    still alive."""
661
660