/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/per_branch/test_locking.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-19 18:31:46 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7005.
  • Revision ID: jelmer@jelmer.uk-20180619183146-vswp38w2zexg9u94
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_locking.py
306
306
                # This test does not apply, because this lockable refuses
307
307
                # tokens.
308
308
                return
309
 
            different_branch_token = lock.token + 'xxx'
 
309
            different_branch_token = lock.token + b'xxx'
310
310
            # Re-using the same lockable instance with a different branch token
311
311
            # will raise TokenMismatch.
312
312
            self.assertRaises(errors.TokenMismatch,
320
320
                # This test does not apply, because this branch refuses
321
321
                # tokens.
322
322
                return
323
 
            different_branch_token = lock.token + 'xxx'
 
323
            different_branch_token = lock.token + b'xxx'
324
324
 
325
325
            new_branch = branch.controldir.open_branch()
326
326
            # We only want to test the relocking abilities of branch, so use the