← 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: Alexander Belchenko
  • Date: 2006-10-14 08:51:07 UTC
  • mto: (2080.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2081.
  • Revision ID: bialix@ukr.net-20061014085107-8dff865674eed30a
win32 installer: make short info page instead of full GPL license text

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) 2005, 2006 by 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
#
17
17
 
18
18
"""Tests of the 'bzr add' command."""
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    osutils,
24
 
    tests,
25
 
    )
26
 
from bzrlib.tests import (
27
 
    script,
28
 
    )
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))
35
 
    scenarios = [
36
 
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
37
 
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
38
 
        ]
39
 
    return tests.multiply_tests(to_adapt, scenarios, result)
40
 
 
41
 
 
42
 
class TestAdd(tests.TestCaseWithTransport):
43
 
 
44
 
    def make_branch_and_tree(self, dir):
45
 
        return super(TestAdd, self).make_branch_and_tree(
46
 
            dir, format=self.branch_tree_format)
47
 
 
 
22
from bzrlib.tests.blackbox import ExternalBase
 
23
 
 
24
 
 
25
class TestAdd(ExternalBase):
 
26
        
48
27
    def test_add_reports(self):
49
28
        """add command prints the names of added files."""
50
 
        tree = self.make_branch_and_tree('.')
 
29
        self.runbzr('init')
51
30
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
52
31
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
53
 
        out = self.run_bzr('add')[0]
 
32
        out = self.run_bzr_captured(['add'], retcode=0)[0]
54
33
        # the ordering is not defined at the moment
55
34
        results = sorted(out.rstrip('\n').split('\n'))
56
 
        self.assertEquals(['adding .bzrignore',
57
 
                           'adding dir',
58
 
                           'adding dir/sub.txt',
59
 
                           'adding top.txt'],
 
35
        self.assertEquals(['If you wish to add some of these files, please'\
 
36
                           ' add them by name.',
 
37
                           'added .bzrignore',
 
38
                           'added dir',
 
39
                           'added dir/sub.txt',
 
40
                           'added top.txt',
 
41
                           'ignored 1 file(s).'],
60
42
                          results)
61
 
        out = self.run_bzr('add -v')[0]
 
43
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
62
44
        results = sorted(out.rstrip('\n').split('\n'))
63
 
        self.assertEquals(['ignored CVS matching "CVS"'],
 
45
        self.assertEquals(['If you wish to add some of these files, please'\
 
46
                           ' add them by name.',
 
47
                           'ignored CVS matching "CVS"'],
64
48
                          results)
65
49
 
66
50
    def test_add_quiet_is(self):
67
51
        """add -q does not print the names of added files."""
68
 
        tree = self.make_branch_and_tree('.')
 
52
        self.runbzr('init')
69
53
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
70
 
        out = self.run_bzr('add -q')[0]
 
54
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
71
55
        # the ordering is not defined at the moment
72
56
        results = sorted(out.rstrip('\n').split('\n'))
73
57
        self.assertEquals([''], results)
77
61
 
78
62
        "bzr add" should add the parent(s) as necessary.
79
63
        """
80
 
        tree = self.make_branch_and_tree('.')
 
64
        self.runbzr('init')
81
65
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
82
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
83
 
        self.run_bzr('add inertiatic/esp')
84
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
66
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
 
67
        self.run_bzr('add', 'inertiatic/esp')
 
68
        self.assertEquals(self.capture('unknowns'), '')
85
69
 
86
70
        # Multiple unversioned parents
87
71
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
88
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
89
 
        self.run_bzr('add veil/cerpin/taxt')
90
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
72
        self.assertEquals(self.capture('unknowns'), 'veil\n')
 
73
        self.run_bzr('add', 'veil/cerpin/taxt')
 
74
        self.assertEquals(self.capture('unknowns'), '')
91
75
 
92
76
        # Check whacky paths work
93
77
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
94
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
95
 
        self.run_bzr('add inertiatic/../cicatriz/esp')
96
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
78
        self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
 
79
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
 
80
        self.assertEquals(self.capture('unknowns'), '')
97
81
 
98
82
    def test_add_in_versioned(self):
99
83
        """Try to add a file in a versioned directory.
100
84
 
101
85
        "bzr add" should do this happily.
102
86
        """
103
 
        tree = self.make_branch_and_tree('.')
 
87
        self.runbzr('init')
104
88
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
105
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
106
 
        self.run_bzr('add --no-recurse inertiatic')
107
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
108
 
        self.run_bzr('add inertiatic/esp')
109
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
 
90
        self.run_bzr('add', '--no-recurse', 'inertiatic')
 
91
        self.assertEquals(self.capture('unknowns'), 'inertiatic/esp\n')
 
92
        self.run_bzr('add', 'inertiatic/esp')
 
93
        self.assertEquals(self.capture('unknowns'), '')
110
94
 
111
95
    def test_subdir_add(self):
112
96
        """Add in subdirectory should add only things from there down"""
114
98
 
115
99
        eq = self.assertEqual
116
100
        ass = self.assertTrue
117
 
 
 
101
        chdir = os.chdir
 
102
        
118
103
        t = self.make_branch_and_tree('.')
119
104
        b = t.branch
120
105
        self.build_tree(['src/', 'README'])
121
 
 
 
106
        
122
107
        eq(sorted(t.unknowns()),
123
108
           ['README', 'src'])
124
 
 
125
 
        self.run_bzr('add src')
126
 
 
 
109
        
 
110
        self.run_bzr('add', 'src')
 
111
        
127
112
        self.build_tree(['src/foo.c'])
128
 
 
129
 
        # add with no arguments in a subdirectory gets only files below that
130
 
        # subdirectory
131
 
        self.run_bzr('add', working_dir='src')
132
 
        self.assertEquals('README\n',
133
 
                          self.run_bzr('unknowns', working_dir='src')[0])
134
 
        # reopen to see the new changes
135
 
        t = t.bzrdir.open_workingtree('src')
136
 
        versioned = [path for path, entry in t.iter_entries_by_dir()]
137
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
138
 
 
139
 
        # add from the parent directory should pick up all file names
140
 
        self.run_bzr('add')
141
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
113
        
 
114
        chdir('src')
 
115
        self.run_bzr('add')
 
116
        
 
117
        self.assertEquals(self.capture('unknowns'), 'README\n')
 
118
        eq(len(t.read_working_inventory()), 3)
 
119
                
 
120
        chdir('..')
 
121
        self.run_bzr('add')
 
122
        self.assertEquals(self.capture('unknowns'), '')
142
123
        self.run_bzr('check')
143
124
 
144
125
    def test_add_missing(self):
145
126
        """bzr add foo where foo is missing should error."""
146
127
        self.make_branch_and_tree('.')
147
 
        self.run_bzr('add missing-file', retcode=3)
 
128
        self.run_bzr('add', 'missing-file', retcode=3)
148
129
 
149
130
    def test_add_from(self):
150
131
        base_tree = self.make_branch_and_tree('base')
156
137
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
157
138
 
158
139
        os.chdir('new')
159
 
        out, err = self.run_bzr('add --file-ids-from ../base')
 
140
        out, err = self.run_bzr('add', '--file-ids-from', '../base')
160
141
        self.assertEqual('', err)
161
 
        self.assertEqualDiff('adding a w/ file id from a\n'
162
 
                             'adding b w/ file id from b\n'
163
 
                             'adding b/c w/ file id from b/c\n',
 
142
        self.assertEqualDiff('added a w/ file id from a\n'
 
143
                             'added b w/ file id from b\n'
 
144
                             'added b/c w/ file id from b/c\n',
164
145
                             out)
165
 
        new_tree = new_tree.bzrdir.open_workingtree()
 
146
 
 
147
        new_tree.read_working_inventory()
166
148
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
167
149
        self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
168
150
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
177
159
        self.build_tree(['new/c', 'new/d'])
178
160
 
179
161
        os.chdir('new')
180
 
        out, err = self.run_bzr('add --file-ids-from ../base/b')
 
162
        out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
181
163
        self.assertEqual('', err)
182
 
        self.assertEqualDiff('adding c w/ file id from b/c\n'
183
 
                             'adding d w/ file id from b/d\n',
 
164
        self.assertEqualDiff('added c w/ file id from b/c\n'
 
165
                             'added d w/ file id from b/d\n',
184
166
                             out)
185
167
 
186
 
        new_tree = new_tree.bzrdir.open_workingtree()
 
168
        new_tree.read_working_inventory()
187
169
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
188
170
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
189
171
 
190
172
    def test_add_dry_run(self):
191
 
        """Test a dry run add, make sure nothing is added."""
192
 
        wt = self.make_branch_and_tree('.')
193
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
194
 
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
195
 
        self.run_bzr('add --dry-run')
196
 
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
197
 
 
198
 
    def test_add_control_dir(self):
199
 
        """The control dir and its content should be refused."""
200
 
        self.make_branch_and_tree('.')
201
 
        err = self.run_bzr('add .bzr', retcode=3)[1]
202
 
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
203
 
        err = self.run_bzr('add .bzr/README', retcode=3)[1]
204
 
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
205
 
        self.build_tree(['.bzr/crescent'])
206
 
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
207
 
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
208
 
 
209
 
    def test_add_via_symlink(self):
210
 
        self.requireFeature(tests.SymlinkFeature)
211
 
        self.make_branch_and_tree('source')
212
 
        self.build_tree(['source/top.txt'])
213
 
        os.symlink('source', 'link')
214
 
        out = self.run_bzr(['add', 'link/top.txt'])[0]
215
 
        self.assertEquals(out, 'adding top.txt\n')
216
 
 
217
 
    def test_add_symlink_to_abspath(self):
218
 
        self.requireFeature(tests.SymlinkFeature)
219
 
        self.make_branch_and_tree('tree')
220
 
        os.symlink(osutils.abspath('target'), 'tree/link')
221
 
        out = self.run_bzr(['add', 'tree/link'])[0]
222
 
        self.assertEquals(out, 'adding link\n')
223
 
 
224
 
    def test_add_not_child(self):
225
 
        # https://bugs.launchpad.net/bzr/+bug/98735
226
 
        sr = script.ScriptRunner()
227
 
        self.make_branch_and_tree('tree1')
228
 
        self.make_branch_and_tree('tree2')
229
 
        self.build_tree(['tree1/a', 'tree2/b'])
230
 
        sr.run_script(self, '''
231
 
        $ bzr add tree1/a tree2/b
232
 
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
233
 
        ''')
 
173
        # ensure that --dry-run actually don't add anything
 
174
        base_tree = self.make_branch_and_tree('.')
 
175
        self.build_tree(['spam'])
 
176
        out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
 
177
        self.assertEquals('added spam\n', out)
 
178
        out = self.run_bzr_captured(['added'], retcode=0)[0]
 
179
        self.assertEquals('', out)