← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
1
 
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
197
197
        self.assertEqual('%s %s\n'
198
198
                         '%s\n%s\n'
199
199
                         'Will continue to try until %s, unless '
200
 
                         'you press Ctrl-C\n'
201
 
                         'If you\'re sure that it\'s not being '
202
 
                         'modified, use bzr break-lock %s',
 
200
                         'you press Ctrl-C.\n'
 
201
                         'See "bzr help break-lock" for more.',
203
202
                         self._logged_reports[0][0])
204
203
        args = self._logged_reports[0][1]
205
204
        self.assertEqual('Unable to obtain', args[0])
420
419
        self.assertEqual('%s %s\n'
421
420
                         '%s\n%s\n'
422
421
                         'Will continue to try until %s, unless '
423
 
                         'you press Ctrl-C\n'
424
 
                         'If you\'re sure that it\'s not being '
425
 
                         'modified, use bzr break-lock %s',
 
422
                         'you press Ctrl-C.\n'
 
423
                         'See "bzr help break-lock" for more.',
426
424
                         self._logged_reports[0][0])
427
425
        args = self._logged_reports[0][1]
428
426
        self.assertEqual('Unable to obtain', args[0])
435
433
        self.assertEqual('%s %s\n'
436
434
                         '%s\n%s\n'
437
435
                         'Will continue to try until %s, unless '
438
 
                         'you press Ctrl-C\n'
439
 
                         'If you\'re sure that it\'s not being '
440
 
                         'modified, use bzr break-lock %s',
 
436
                         'you press Ctrl-C.\n'
 
437
                         'See "bzr help break-lock" for more.',
441
438
                         self._logged_reports[1][0])
442
439
        args = self._logged_reports[1][1]
443
440
        self.assertEqual('Lock owner changed for', args[0])