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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
24
24
 
25
25
from testtools.matchers import DocTestMatches
26
26
 
27
 
from breezy import (
 
27
from ... import (
28
28
    config,
29
29
    osutils,
30
30
    ignores,
31
31
    msgeditor,
32
32
    )
33
 
from breezy.controldir import ControlDir
34
 
from breezy.tests import (
 
33
from ...controldir import ControlDir
 
34
from .. import (
35
35
    test_foreign,
36
36
    features,
37
37
    )
38
 
from breezy.tests import TestCaseWithTransport
39
 
from breezy.tests.matchers import ContainsNoVfsCalls
 
38
from .. import TestCaseWithTransport
 
39
from ..matchers import ContainsNoVfsCalls
40
40
 
41
41
 
42
42
class TestCommit(TestCaseWithTransport):
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('.')
809
809
            f = file('fed.sh', 'wb')
810
810
            f.write('#!/bin/sh\n')
811
811
            f.close()
812
 
            os.chmod('fed.sh', 0755)
 
812
            os.chmod('fed.sh', 0o755)
813
813
            self.overrideEnv('BRZ_EDITOR', "./fed.sh")
814
814
 
815
815
    def setup_commit_with_template(self):