← 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

Initial commit for russian version of documents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
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 osutils
23
 
from bzrlib.tests import (
24
 
    condition_isinstance,
25
 
    split_suite_by_condition,
26
 
    multiply_tests,
27
 
    SymlinkFeature
28
 
    )
29
22
from bzrlib.tests.blackbox import ExternalBase
30
23
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
31
24
 
32
25
 
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))
37
 
    scenarios = [
38
 
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
 
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
40
 
        ]
41
 
    return multiply_tests(to_adapt, scenarios, result)
42
 
 
43
 
 
44
26
class TestAdd(ExternalBase):
45
 
 
46
 
    def make_branch_and_tree(self, dir):
47
 
        return ExternalBase.make_branch_and_tree(self, dir,
48
 
            format=self.branch_tree_format)
49
 
 
 
27
        
50
28
    def test_add_reports(self):
51
29
        """add command prints the names of added files."""
52
30
        tree = self.make_branch_and_tree('.')
55
33
        out = self.run_bzr('add')[0]
56
34
        # the ordering is not defined at the moment
57
35
        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',
62
 
                           'adding dir',
63
 
                           'adding dir/sub.txt',
64
 
                           'adding top.txt',
 
36
        self.assertEquals(['If you wish to add some of these files, please'\
 
37
                           ' add them by name.',
 
38
                           'added .bzrignore',
 
39
                           'added dir',
 
40
                           'added dir/sub.txt',
 
41
                           'added top.txt',
65
42
                           'ignored 1 file(s).'],
66
43
                          results)
67
44
        out = self.run_bzr('add -v')[0]
68
45
        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)',
 
46
        self.assertEquals(['If you wish to add some of these files, please'\
 
47
                           ' add them by name.',
71
48
                           'ignored CVS matching "CVS"'],
72
49
                          results)
73
50
 
74
51
    def test_add_quiet_is(self):
75
52
        """add -q does not print the names of added files."""
76
 
        tree = self.make_branch_and_tree('.')
 
53
        tree = self.make_branch_and_tree('.') 
77
54
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
78
55
        out = self.run_bzr('add -q')[0]
79
56
        # the ordering is not defined at the moment
123
100
        eq = self.assertEqual
124
101
        ass = self.assertTrue
125
102
        chdir = os.chdir
126
 
 
 
103
        
127
104
        t = self.make_branch_and_tree('.')
128
105
        b = t.branch
129
106
        self.build_tree(['src/', 'README'])
130
 
 
 
107
        
131
108
        eq(sorted(t.unknowns()),
132
109
           ['README', 'src'])
133
 
 
 
110
        
134
111
        self.run_bzr('add src')
135
 
 
 
112
        
136
113
        self.build_tree(['src/foo.c'])
137
 
 
 
114
        
138
115
        # add with no arguments in a subdirectory gets only files below that
139
116
        # subdirectory
140
117
        chdir('src')
145
122
        versioned = [path for path, entry in t.iter_entries_by_dir()]
146
123
        self.assertEquals(versioned,
147
124
            ['', 'src', 'src/foo.c'])
148
 
 
 
125
                
149
126
        # add from the parent directory should pick up all file names
150
127
        chdir('..')
151
128
        self.run_bzr('add')
169
146
        os.chdir('new')
170
147
        out, err = self.run_bzr('add --file-ids-from ../base')
171
148
        self.assertEqual('', err)
172
 
        self.assertEqualDiff('adding a w/ file id from a\n'
173
 
                             'adding b w/ file id from b\n'
174
 
                             'adding b/c w/ file id from b/c\n',
 
149
        self.assertEqualDiff('added a w/ file id from a\n'
 
150
                             'added b w/ file id from b\n'
 
151
                             'added b/c w/ file id from b/c\n',
175
152
                             out)
176
153
        new_tree = new_tree.bzrdir.open_workingtree()
177
154
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
190
167
        os.chdir('new')
191
168
        out, err = self.run_bzr('add --file-ids-from ../base/b')
192
169
        self.assertEqual('', err)
193
 
        self.assertEqualDiff('adding c w/ file id from b/c\n'
194
 
                             'adding d w/ file id from b/d\n',
 
170
        self.assertEqualDiff('added c w/ file id from b/c\n'
 
171
                             'added d w/ file id from b/d\n',
195
172
                             out)
196
173
 
197
174
        new_tree = new_tree.bzrdir.open_workingtree()
230
207
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
231
208
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
232
209
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
233
 
 
234
 
    def test_add_via_symlink(self):
235
 
        self.requireFeature(SymlinkFeature)
236
 
        self.make_branch_and_tree('source')
237
 
        self.build_tree(['source/top.txt'])
238
 
        os.symlink('source', 'link')
239
 
        out = self.run_bzr(['add', 'link/top.txt'])[0]
240
 
        self.assertEquals(out, 'adding top.txt\n')
241
 
 
242
 
    def test_add_symlink_to_abspath(self):
243
 
        self.requireFeature(SymlinkFeature)
244
 
        self.make_branch_and_tree('tree')
245
 
        os.symlink(osutils.abspath('target'), 'tree/link')
246
 
        out = self.run_bzr(['add', 'tree/link'])[0]
247
 
        self.assertEquals(out, 'adding link\n')