← 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) 2005, 2006, 2007 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import osutils
 
22
from bzrlib import (
 
23
    osutils,
 
24
    tests,
 
25
    )
23
26
from bzrlib.tests import (
24
 
    condition_isinstance,
25
 
    split_suite_by_condition,
26
 
    multiply_tests,
27
 
    SymlinkFeature
 
27
    features,
 
28
    script,
28
29
    )
29
 
from bzrlib.tests.blackbox import ExternalBase
30
 
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
31
 
 
32
 
 
33
 
def load_tests(standard_tests, module, loader):
34
 
    """Parameterize tests for view-aware vs not."""
35
 
    to_adapt, result = split_suite_by_condition(
36
 
        standard_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
 
37
38
    scenarios = [
38
39
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
 
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
 
40
        ('view-aware', {'branch_tree_format': '2a'}),
40
41
        ]
41
 
    return multiply_tests(to_adapt, scenarios, result)
42
 
 
43
 
 
44
 
class TestAdd(ExternalBase):
45
42
 
46
43
    def make_branch_and_tree(self, dir):
47
 
        return ExternalBase.make_branch_and_tree(self, dir,
48
 
            format=self.branch_tree_format)
 
44
        return super(TestAdd, self).make_branch_and_tree(
 
45
            dir, format=self.branch_tree_format)
49
46
 
50
47
    def test_add_reports(self):
51
48
        """add command prints the names of added files."""
55
52
        out = self.run_bzr('add')[0]
56
53
        # the ordering is not defined at the moment
57
54
        results = sorted(out.rstrip('\n').split('\n'))
58
 
        self.assertEquals(['If you wish to add ignored files, '
59
 
                           'please add them explicitly by name. '
60
 
                           '("bzr ignored" gives a list)',
61
 
                           'adding .bzrignore',
 
55
        self.assertEqual(['adding .bzrignore',
62
56
                           'adding dir',
63
57
                           'adding dir/sub.txt',
64
 
                           'adding top.txt',
65
 
                           'ignored 1 file(s).'],
 
58
                           'adding top.txt'],
66
59
                          results)
67
60
        out = self.run_bzr('add -v')[0]
68
61
        results = sorted(out.rstrip('\n').split('\n'))
69
 
        self.assertEquals(['If you wish to add ignored files, '\
70
 
                           'please add them explicitly by name. ("bzr ignored" gives a list)',
71
 
                           'ignored CVS matching "CVS"'],
 
62
        self.assertEqual(['ignored CVS matching "CVS"'],
72
63
                          results)
73
64
 
74
65
    def test_add_quiet_is(self):
78
69
        out = self.run_bzr('add -q')[0]
79
70
        # the ordering is not defined at the moment
80
71
        results = sorted(out.rstrip('\n').split('\n'))
81
 
        self.assertEquals([''], results)
 
72
        self.assertEqual([''], results)
82
73
 
83
74
    def test_add_in_unversioned(self):
84
75
        """Try to add a file in an unversioned directory.
87
78
        """
88
79
        tree = self.make_branch_and_tree('.')
89
80
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
81
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
91
82
        self.run_bzr('add inertiatic/esp')
92
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
83
        self.assertEqual(self.run_bzr('unknowns')[0], '')
93
84
 
94
85
        # Multiple unversioned parents
95
86
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
96
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
 
87
        self.assertEqual(self.run_bzr('unknowns')[0], 'veil\n')
97
88
        self.run_bzr('add veil/cerpin/taxt')
98
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEqual(self.run_bzr('unknowns')[0], '')
99
90
 
100
91
        # Check whacky paths work
101
92
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
102
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
 
93
        self.assertEqual(self.run_bzr('unknowns')[0], 'cicatriz\n')
103
94
        self.run_bzr('add inertiatic/../cicatriz/esp')
104
 
        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')
105
103
 
106
104
    def test_add_in_versioned(self):
107
105
        """Try to add a file in a versioned directory.
110
108
        """
111
109
        tree = self.make_branch_and_tree('.')
112
110
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
113
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
111
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
114
112
        self.run_bzr('add --no-recurse inertiatic')
115
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
 
113
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
116
114
        self.run_bzr('add inertiatic/esp')
117
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
115
        self.assertEqual(self.run_bzr('unknowns')[0], '')
118
116
 
119
117
    def test_subdir_add(self):
120
118
        """Add in subdirectory should add only things from there down"""
121
 
        from bzrlib.workingtree import WorkingTree
122
 
 
123
119
        eq = self.assertEqual
124
120
        ass = self.assertTrue
125
 
        chdir = os.chdir
126
121
 
127
122
        t = self.make_branch_and_tree('.')
128
123
        b = t.branch
137
132
 
138
133
        # add with no arguments in a subdirectory gets only files below that
139
134
        # subdirectory
140
 
        chdir('src')
141
 
        self.run_bzr('add')
142
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
 
135
        self.run_bzr('add', working_dir='src')
 
136
        self.assertEqual('README\n',
 
137
                          self.run_bzr('unknowns', working_dir='src')[0])
143
138
        # reopen to see the new changes
144
 
        t = t.bzrdir.open_workingtree()
 
139
        t = t.bzrdir.open_workingtree('src')
145
140
        versioned = [path for path, entry in t.iter_entries_by_dir()]
146
 
        self.assertEquals(versioned,
147
 
            ['', 'src', 'src/foo.c'])
 
141
        self.assertEqual(versioned, ['', 'src', 'src/foo.c'])
148
142
 
149
143
        # add from the parent directory should pick up all file names
150
 
        chdir('..')
151
144
        self.run_bzr('add')
152
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
145
        self.assertEqual(self.run_bzr('unknowns')[0], '')
153
146
        self.run_bzr('check')
154
147
 
155
148
    def test_add_missing(self):
166
159
        new_tree = self.make_branch_and_tree('new')
167
160
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
168
161
 
169
 
        os.chdir('new')
170
 
        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')
171
164
        self.assertEqual('', err)
172
165
        self.assertEqualDiff('adding a w/ file id from a\n'
173
166
                             'adding b w/ file id from b\n'
187
180
        new_tree = self.make_branch_and_tree('new')
188
181
        self.build_tree(['new/c', 'new/d'])
189
182
 
190
 
        os.chdir('new')
191
 
        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')
192
185
        self.assertEqual('', err)
193
186
        self.assertEqualDiff('adding c w/ file id from b/c\n'
194
187
                             'adding d w/ file id from b/d\n',
195
188
                             out)
196
189
 
197
 
        new_tree = new_tree.bzrdir.open_workingtree()
 
190
        new_tree = new_tree.bzrdir.open_workingtree('new')
198
191
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
199
192
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
200
193
 
217
210
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
218
211
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
219
212
 
220
 
    def test_add_with_wildcards(self):
221
 
        self.requireFeature(NeedsGlobExpansionFeature)
222
 
        self.make_branch_and_tree('.')
223
 
        self.build_tree(['a1', 'a2', 'b', 'c33'])
224
 
        self.run_bzr(['add', 'a?', 'c*'])
225
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
226
 
 
227
 
    def test_add_with_wildcards_unicode(self):
228
 
        self.requireFeature(NeedsGlobExpansionFeature)
229
 
        self.make_branch_and_tree('.')
230
 
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
231
 
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
232
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
233
 
 
234
213
    def test_add_via_symlink(self):
235
 
        self.requireFeature(SymlinkFeature)
 
214
        self.requireFeature(features.SymlinkFeature)
236
215
        self.make_branch_and_tree('source')
237
216
        self.build_tree(['source/top.txt'])
238
217
        os.symlink('source', 'link')
239
218
        out = self.run_bzr(['add', 'link/top.txt'])[0]
240
 
        self.assertEquals(out, 'adding top.txt\n')
 
219
        self.assertEqual(out, 'adding top.txt\n')
241
220
 
242
221
    def test_add_symlink_to_abspath(self):
243
 
        self.requireFeature(SymlinkFeature)
 
222
        self.requireFeature(features.SymlinkFeature)
244
223
        self.make_branch_and_tree('tree')
245
224
        os.symlink(osutils.abspath('target'), 'tree/link')
246
225
        out = self.run_bzr(['add', 'tree/link'])[0]
247
 
        self.assertEquals(out, 'adding link\n')
 
226
        self.assertEqual(out, 'adding link\n')
 
227
 
 
228
    def test_add_not_child(self):
 
229
        # https://bugs.launchpad.net/bzr/+bug/98735
 
230
        sr = script.ScriptRunner()
 
231
        self.make_branch_and_tree('tree1')
 
232
        self.make_branch_and_tree('tree2')
 
233
        self.build_tree(['tree1/a', 'tree2/b'])
 
234
        sr.run_script(self, '''
 
235
        $ bzr add tree1/a tree2/b
 
236
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
 
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)