← 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: Martin Pool
  • Date: 2010-01-29 10:36:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4992.
  • Revision ID: mbp@sourcefrog.net-20100129103623-hywka5hymo5z13jw
Change url to canonical.com or wiki, plus some doc improvements in passing

Show diffs side-by-side

added added

removed removed

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