/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 breezy/tests/test_lockdir.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-28 02:47:10 UTC
  • mfrom: (7519.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200728024710-a2ylds219f1lsl62
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/388173

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_lockdir.py
40
40
    LockDir,
41
41
    LockHeldInfo,
42
42
    )
43
 
from ..sixish import (
44
 
    text_type,
45
 
    )
46
43
from . import (
47
44
    features,
48
45
    TestCase,
668
665
 
669
666
    def test_unicode(self):
670
667
        info = LockHeldInfo.for_this_process(None)
671
 
        self.assertContainsRe(text_type(info),
 
668
        self.assertContainsRe(str(info),
672
669
                              r'held by .* on .* \(process #\d+\), acquired .* ago')
673
670
 
674
671
    def test_is_locked_by_this_process(self):