/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 bzrlib/tests/blackbox/test_commit.py

Merge start of 2to3 fix work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
214
214
        wt.rename_one('hello.txt', 'subdir/hello.txt')
215
215
        out, err = self.run_bzr('commit -m renamed')
216
216
        self.assertEqual('', out)
217
 
        self.assertEqual(set([
 
217
        self.assertEqual({
218
218
            'Committing to: %s/' % osutils.getcwd(),
219
219
            'added subdir',
220
220
            'renamed hello.txt => subdir/hello.txt',
221
221
            'Committed revision 2.',
222
222
            '',
223
 
            ]), set(err.split('\n')))
 
223
            }, set(err.split('\n')))
224
224
 
225
225
    def test_verbose_commit_with_unknown(self):
226
226
        """Unknown files should not be listed by default in verbose output"""
330
330
        this_tree.merge_from_branch(other_tree.branch)
331
331
        out, err = self.run_bzr('commit -m added', working_dir='this')
332
332
        self.assertEqual('', out)
333
 
        self.assertEqual(set([
 
333
        self.assertEqual({
334
334
            'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
335
335
            'modified filetomodify',
336
336
            'added newdir',
343
343
            'deleted filetoremove',
344
344
            'Committed revision 2.',
345
345
            ''
346
 
            ]), set(err.split('\n')))
 
346
            }, set(err.split('\n')))
347
347
 
348
348
    def test_empty_commit_message(self):
349
349
        tree = self.make_branch_and_tree('.')
776
776
            f = file('fed.sh', 'wb')
777
777
            f.write('#!/bin/sh\n')
778
778
            f.close()
779
 
            os.chmod('fed.sh', 0755)
 
779
            os.chmod('fed.sh', 0o755)
780
780
            self.overrideEnv('BZR_EDITOR', "./fed.sh")
781
781
 
782
782
    def setup_commit_with_template(self):