← 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: Robert Collins
  • Date: 2010-01-28 18:05:44 UTC
  • mto: (4797.2.5 2.1)
  • mto: This revision was merged to the branch mainline in revision 4989.
  • Revision ID: robertc@robertcollins.net-20100128180544-6l8x7o7obaq7b51x
Tweak ConfigurableFileMerger to use class variables rather than requiring __init__ wrapping as future proofing for helper functions.

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) 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
 
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
 
30
 
 
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)
24
41
 
25
42
 
26
43
class TestAdd(ExternalBase):
27
 
        
 
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
 
28
49
    def test_add_reports(self):
29
50
        """add command prints the names of added files."""
30
51
        tree = self.make_branch_and_tree('.')
33
54
        out = self.run_bzr('add')[0]
34
55
        # the ordering is not defined at the moment
35
56
        results = sorted(out.rstrip('\n').split('\n'))
36
 
        self.assertEquals(['If you wish to add some of these files, please'\
37
 
                           ' add them by name.',
38
 
                           'add completed',
39
 
                           'adding .bzrignore',
 
57
        self.assertEquals(['adding .bzrignore',
40
58
                           'adding dir',
41
59
                           'adding dir/sub.txt',
42
 
                           'adding top.txt',
43
 
                           'ignored 1 file(s).'],
 
60
                           'adding top.txt'],
44
61
                          results)
45
62
        out = self.run_bzr('add -v')[0]
46
63
        results = sorted(out.rstrip('\n').split('\n'))
47
 
        self.assertEquals(['If you wish to add some of these files, please'\
48
 
                           ' add them by name.',
49
 
                           'ignored CVS matching "CVS"'],
 
64
        self.assertEquals(['ignored CVS matching "CVS"'],
50
65
                          results)
51
66
 
52
67
    def test_add_quiet_is(self):
53
68
        """add -q does not print the names of added files."""
54
 
        tree = self.make_branch_and_tree('.') 
 
69
        tree = self.make_branch_and_tree('.')
55
70
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
56
71
        out = self.run_bzr('add -q')[0]
57
72
        # the ordering is not defined at the moment
101
116
        eq = self.assertEqual
102
117
        ass = self.assertTrue
103
118
        chdir = os.chdir
104
 
        
 
119
 
105
120
        t = self.make_branch_and_tree('.')
106
121
        b = t.branch
107
122
        self.build_tree(['src/', 'README'])
108
 
        
 
123
 
109
124
        eq(sorted(t.unknowns()),
110
125
           ['README', 'src'])
111
 
        
 
126
 
112
127
        self.run_bzr('add src')
113
 
        
 
128
 
114
129
        self.build_tree(['src/foo.c'])
115
 
        
 
130
 
116
131
        # add with no arguments in a subdirectory gets only files below that
117
132
        # subdirectory
118
133
        chdir('src')
123
138
        versioned = [path for path, entry in t.iter_entries_by_dir()]
124
139
        self.assertEquals(versioned,
125
140
            ['', 'src', 'src/foo.c'])
126
 
                
 
141
 
127
142
        # add from the parent directory should pick up all file names
128
143
        chdir('..')
129
144
        self.run_bzr('add')
149
164
        self.assertEqual('', err)
150
165
        self.assertEqualDiff('adding a w/ file id from a\n'
151
166
                             'adding b w/ file id from b\n'
152
 
                             'adding b/c w/ file id from b/c\n'
153
 
                             'add completed\n',
 
167
                             'adding b/c w/ file id from b/c\n',
154
168
                             out)
155
169
        new_tree = new_tree.bzrdir.open_workingtree()
156
170
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
170
184
        out, err = self.run_bzr('add --file-ids-from ../base/b')
171
185
        self.assertEqual('', err)
172
186
        self.assertEqualDiff('adding c w/ file id from b/c\n'
173
 
                             'adding d w/ file id from b/d\n'
174
 
                             'add completed\n',
 
187
                             'adding d w/ file id from b/d\n',
175
188
                             out)
176
189
 
177
190
        new_tree = new_tree.bzrdir.open_workingtree()
197
210
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
198
211
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
199
212
 
200
 
    def test_add_with_wildcards(self):
201
 
        self.requireFeature(NeedsGlobExpansionFeature)
202
 
        self.make_branch_and_tree('.')
203
 
        self.build_tree(['a1', 'a2', 'b', 'c33'])
204
 
        self.run_bzr(['add', 'a?', 'c*'])
205
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
 
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')
206
220
 
207
 
    def test_add_with_wildcards_unicode(self):
208
 
        self.requireFeature(NeedsGlobExpansionFeature)
209
 
        self.make_branch_and_tree('.')
210
 
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
211
 
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
212
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
 
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')