← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012, 2016 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
24
24
    tests,
25
25
    )
26
26
from bzrlib.tests import (
 
27
    features,
27
28
    script,
28
29
    )
29
 
 
30
 
 
31
 
def load_tests(standard_tests, module, loader):
32
 
    """Parameterize tests for view-aware vs not."""
33
 
    to_adapt, result = tests.split_suite_by_condition(
34
 
        standard_tests, tests.condition_isinstance(TestAdd))
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
 
34
 
 
35
 
 
36
class TestAdd(tests.TestCaseWithTransport):
 
37
 
35
38
    scenarios = [
36
39
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
37
 
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
 
40
        ('view-aware', {'branch_tree_format': '2a'}),
38
41
        ]
39
 
    return tests.multiply_tests(to_adapt, scenarios, result)
40
 
 
41
 
 
42
 
class TestAdd(tests.TestCaseWithTransport):
43
42
 
44
43
    def make_branch_and_tree(self, dir):
45
44
        return super(TestAdd, self).make_branch_and_tree(
53
52
        out = self.run_bzr('add')[0]
54
53
        # the ordering is not defined at the moment
55
54
        results = sorted(out.rstrip('\n').split('\n'))
56
 
        self.assertEquals(['adding .bzrignore',
 
55
        self.assertEqual(['adding .bzrignore',
57
56
                           'adding dir',
58
57
                           'adding dir/sub.txt',
59
58
                           'adding top.txt'],
60
59
                          results)
61
60
        out = self.run_bzr('add -v')[0]
62
61
        results = sorted(out.rstrip('\n').split('\n'))
63
 
        self.assertEquals(['ignored CVS matching "CVS"'],
 
62
        self.assertEqual(['ignored CVS matching "CVS"'],
64
63
                          results)
65
64
 
66
65
    def test_add_quiet_is(self):
70
69
        out = self.run_bzr('add -q')[0]
71
70
        # the ordering is not defined at the moment
72
71
        results = sorted(out.rstrip('\n').split('\n'))
73
 
        self.assertEquals([''], results)
 
72
        self.assertEqual([''], results)
74
73
 
75
74
    def test_add_in_unversioned(self):
76
75
        """Try to add a file in an unversioned directory.
79
78
        """
80
79
        tree = self.make_branch_and_tree('.')
81
80
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
82
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
81
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
83
82
        self.run_bzr('add inertiatic/esp')
84
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
83
        self.assertEqual(self.run_bzr('unknowns')[0], '')
85
84
 
86
85
        # Multiple unversioned parents
87
86
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
88
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
 
87
        self.assertEqual(self.run_bzr('unknowns')[0], 'veil\n')
89
88
        self.run_bzr('add veil/cerpin/taxt')
90
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEqual(self.run_bzr('unknowns')[0], '')
91
90
 
92
91
        # Check whacky paths work
93
92
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
94
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
 
93
        self.assertEqual(self.run_bzr('unknowns')[0], 'cicatriz\n')
95
94
        self.run_bzr('add inertiatic/../cicatriz/esp')
96
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
95
        self.assertEqual(self.run_bzr('unknowns')[0], '')
 
96
 
 
97
    def test_add_no_recurse(self):
 
98
        tree = self.make_branch_and_tree('.')
 
99
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
100
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
101
        self.run_bzr('add -N inertiatic')
 
102
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
97
103
 
98
104
    def test_add_in_versioned(self):
99
105
        """Try to add a file in a versioned directory.
102
108
        """
103
109
        tree = self.make_branch_and_tree('.')
104
110
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
105
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
111
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
106
112
        self.run_bzr('add --no-recurse inertiatic')
107
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
 
113
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
108
114
        self.run_bzr('add inertiatic/esp')
109
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
115
        self.assertEqual(self.run_bzr('unknowns')[0], '')
110
116
 
111
117
    def test_subdir_add(self):
112
118
        """Add in subdirectory should add only things from there down"""
113
 
        from bzrlib.workingtree import WorkingTree
114
 
 
115
119
        eq = self.assertEqual
116
120
        ass = self.assertTrue
117
121
 
129
133
        # add with no arguments in a subdirectory gets only files below that
130
134
        # subdirectory
131
135
        self.run_bzr('add', working_dir='src')
132
 
        self.assertEquals('README\n',
 
136
        self.assertEqual('README\n',
133
137
                          self.run_bzr('unknowns', working_dir='src')[0])
134
138
        # reopen to see the new changes
135
139
        t = t.bzrdir.open_workingtree('src')
136
140
        versioned = [path for path, entry in t.iter_entries_by_dir()]
137
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
 
141
        self.assertEqual(versioned, ['', 'src', 'src/foo.c'])
138
142
 
139
143
        # add from the parent directory should pick up all file names
140
144
        self.run_bzr('add')
141
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
145
        self.assertEqual(self.run_bzr('unknowns')[0], '')
142
146
        self.run_bzr('check')
143
147
 
144
148
    def test_add_missing(self):
155
159
        new_tree = self.make_branch_and_tree('new')
156
160
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
157
161
 
158
 
        os.chdir('new')
159
 
        out, err = self.run_bzr('add --file-ids-from ../base')
 
162
        out, err = self.run_bzr('add --file-ids-from ../base',
 
163
                                working_dir='new')
160
164
        self.assertEqual('', err)
161
165
        self.assertEqualDiff('adding a w/ file id from a\n'
162
166
                             'adding b w/ file id from b\n'
176
180
        new_tree = self.make_branch_and_tree('new')
177
181
        self.build_tree(['new/c', 'new/d'])
178
182
 
179
 
        os.chdir('new')
180
 
        out, err = self.run_bzr('add --file-ids-from ../base/b')
 
183
        out, err = self.run_bzr('add --file-ids-from ../base/b',
 
184
                                working_dir='new')
181
185
        self.assertEqual('', err)
182
186
        self.assertEqualDiff('adding c w/ file id from b/c\n'
183
187
                             'adding d w/ file id from b/d\n',
184
188
                             out)
185
189
 
186
 
        new_tree = new_tree.bzrdir.open_workingtree()
 
190
        new_tree = new_tree.bzrdir.open_workingtree('new')
187
191
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
188
192
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
189
193
 
207
211
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
208
212
 
209
213
    def test_add_via_symlink(self):
210
 
        self.requireFeature(tests.SymlinkFeature)
 
214
        self.requireFeature(features.SymlinkFeature)
211
215
        self.make_branch_and_tree('source')
212
216
        self.build_tree(['source/top.txt'])
213
217
        os.symlink('source', 'link')
214
218
        out = self.run_bzr(['add', 'link/top.txt'])[0]
215
 
        self.assertEquals(out, 'adding top.txt\n')
 
219
        self.assertEqual(out, 'adding top.txt\n')
216
220
 
217
221
    def test_add_symlink_to_abspath(self):
218
 
        self.requireFeature(tests.SymlinkFeature)
 
222
        self.requireFeature(features.SymlinkFeature)
219
223
        self.make_branch_and_tree('tree')
220
224
        os.symlink(osutils.abspath('target'), 'tree/link')
221
225
        out = self.run_bzr(['add', 'tree/link'])[0]
222
 
        self.assertEquals(out, 'adding link\n')
 
226
        self.assertEqual(out, 'adding link\n')
223
227
 
224
228
    def test_add_not_child(self):
225
229
        # https://bugs.launchpad.net/bzr/+bug/98735
231
235
        $ bzr add tree1/a tree2/b
232
236
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
233
237
        ''')
 
238
 
 
239
    def test_add_multiple_files_in_unicode_cwd(self):
 
240
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
 
241
        self.requireFeature(features.UnicodeFilenameFeature)
 
242
        self.make_branch_and_tree(u"\xA7")
 
243
        self.build_tree([u"\xA7/a", u"\xA7/b"])
 
244
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
 
245
        self.assertEqual(out, "adding a\n" "adding b\n")
 
246
        self.assertEqual(err, "")
 
247
 
 
248
    def test_add_skip_large_files(self):
 
249
        """Test skipping files larger than add.maximum_file_size"""
 
250
        tree = self.make_branch_and_tree('.')
 
251
        self.build_tree(['small.txt', 'big.txt', 'big2.txt'])
 
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
        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
 
256
        out = self.run_bzr('add')[0]
 
257
        results = sorted(out.rstrip('\n').split('\n'))
 
258
        self.assertEqual(['adding small.txt'], results)
 
259
        # named items never skipped, even if over max
 
260
        out, err = self.run_bzr(["add", "big2.txt"])
 
261
        results = sorted(out.rstrip('\n').split('\n'))
 
262
        self.assertEqual(['adding big2.txt'], results)
 
263
        self.assertEqual("", err)
 
264
        tree.branch.get_config_stack().set('add.maximum_file_size', 30)
 
265
        out = self.run_bzr('add')[0]
 
266
        results = sorted(out.rstrip('\n').split('\n'))
 
267
        self.assertEqual(['adding big.txt'], results)