/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_add.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_add.py
48
48
        """add command prints the names of added files."""
49
49
        tree = self.make_branch_and_tree('.')
50
50
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
51
 
        self.build_tree_contents([('.bzrignore', b'CVS\n')])
 
51
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
52
52
        out = self.run_bzr('add')[0]
53
53
        # the ordering is not defined at the moment
54
54
        results = sorted(out.rstrip('\n').split('\n'))
55
55
        self.assertEqual(['adding .bzrignore',
56
 
                          'adding dir',
57
 
                          'adding dir/sub.txt',
58
 
                          'adding top.txt'],
59
 
                         results)
 
56
                           'adding dir',
 
57
                           'adding dir/sub.txt',
 
58
                           'adding top.txt'],
 
59
                          results)
60
60
        out = self.run_bzr('add -v')[0]
61
61
        results = sorted(out.rstrip('\n').split('\n'))
62
62
        self.assertEqual(['ignored CVS matching "CVS"'],
63
 
                         results)
 
63
                          results)
64
64
 
65
65
    def test_add_quiet_is(self):
66
66
        """add -q does not print the names of added files."""
134
134
        # subdirectory
135
135
        self.run_bzr('add', working_dir='src')
136
136
        self.assertEqual('README\n',
137
 
                         self.run_bzr('unknowns', working_dir='src')[0])
 
137
                          self.run_bzr('unknowns', working_dir='src')[0])
138
138
        # reopen to see the new changes
139
139
        t = t.controldir.open_workingtree('src')
140
140
        versioned = [path for path, entry in t.iter_entries_by_dir()]
249
249
        """Test skipping files larger than add.maximum_file_size"""
250
250
        tree = self.make_branch_and_tree('.')
251
251
        self.build_tree(['small.txt', 'big.txt', 'big2.txt'])
252
 
        self.build_tree_contents([('small.txt', b'0\n')])
253
 
        self.build_tree_contents([('big.txt', b'01234567890123456789\n')])
254
 
        self.build_tree_contents([('big2.txt', b'01234567890123456789\n')])
 
252
        self.build_tree_contents([('small.txt', '0\n')])
 
253
        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
 
254
        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
255
255
        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
256
256
        out = self.run_bzr('add')[0]
257
257
        results = sorted(out.rstrip('\n').split('\n'))
265
265
        out = self.run_bzr('add')[0]
266
266
        results = sorted(out.rstrip('\n').split('\n'))
267
267
        self.assertEqual(['adding big.txt'], results)
268
 
 
269
 
    def test_add_backslash(self):
270
 
        # pad.lv/165151
271
 
        if os.path.sep == '\\':
272
 
            # TODO(jelmer): Test that backslashes are appropriately
273
 
            # ignored?
274
 
            raise tests.TestNotApplicable(
275
 
                'unable to add filenames with backslashes where '
276
 
                ' it is the path separator')
277
 
        tree = self.make_branch_and_tree('.')
278
 
        self.build_tree(['\\'])
279
 
        self.assertEqual('adding \\\n', self.run_bzr('add \\\\')[0])
280
 
        self.assertEqual('\\\n', self.run_bzr('ls --versioned')[0])