← 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: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

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