← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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) 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import osutils
 
22
from bzrlib import (
 
23
    osutils,
 
24
    tests,
 
25
    )
23
26
from bzrlib.tests import (
24
 
    condition_isinstance,
25
 
    split_suite_by_condition,
26
 
    multiply_tests,
27
 
    SymlinkFeature
 
27
    script,
28
28
    )
29
 
from bzrlib.tests.blackbox import ExternalBase
30
 
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
31
29
 
32
30
 
33
31
def load_tests(standard_tests, module, loader):
34
32
    """Parameterize tests for view-aware vs not."""
35
 
    to_adapt, result = split_suite_by_condition(
36
 
        standard_tests, condition_isinstance(TestAdd))
 
33
    to_adapt, result = tests.split_suite_by_condition(
 
34
        standard_tests, tests.condition_isinstance(TestAdd))
37
35
    scenarios = [
38
36
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
37
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
40
38
        ]
41
 
    return multiply_tests(to_adapt, scenarios, result)
42
 
 
43
 
 
44
 
class TestAdd(ExternalBase):
 
39
    return tests.multiply_tests(to_adapt, scenarios, result)
 
40
 
 
41
 
 
42
class TestAdd(tests.TestCaseWithTransport):
45
43
 
46
44
    def make_branch_and_tree(self, dir):
47
 
        return ExternalBase.make_branch_and_tree(self, dir,
48
 
            format=self.branch_tree_format)
 
45
        return super(TestAdd, self).make_branch_and_tree(
 
46
            dir, format=self.branch_tree_format)
49
47
 
50
48
    def test_add_reports(self):
51
49
        """add command prints the names of added files."""
55
53
        out = self.run_bzr('add')[0]
56
54
        # the ordering is not defined at the moment
57
55
        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',
 
56
        self.assertEquals(['adding .bzrignore',
62
57
                           'adding dir',
63
58
                           'adding dir/sub.txt',
64
 
                           'adding top.txt',
65
 
                           'ignored 1 file(s).'],
 
59
                           'adding top.txt'],
66
60
                          results)
67
61
        out = self.run_bzr('add -v')[0]
68
62
        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)',
71
 
                           'ignored CVS matching "CVS"'],
 
63
        self.assertEquals(['ignored CVS matching "CVS"'],
72
64
                          results)
73
65
 
74
66
    def test_add_quiet_is(self):
122
114
 
123
115
        eq = self.assertEqual
124
116
        ass = self.assertTrue
125
 
        chdir = os.chdir
126
117
 
127
118
        t = self.make_branch_and_tree('.')
128
119
        b = t.branch
137
128
 
138
129
        # add with no arguments in a subdirectory gets only files below that
139
130
        # subdirectory
140
 
        chdir('src')
141
 
        self.run_bzr('add')
142
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
 
131
        self.run_bzr('add', working_dir='src')
 
132
        self.assertEquals('README\n',
 
133
                          self.run_bzr('unknowns', working_dir='src')[0])
143
134
        # reopen to see the new changes
144
 
        t = t.bzrdir.open_workingtree()
 
135
        t = t.bzrdir.open_workingtree('src')
145
136
        versioned = [path for path, entry in t.iter_entries_by_dir()]
146
 
        self.assertEquals(versioned,
147
 
            ['', 'src', 'src/foo.c'])
 
137
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
148
138
 
149
139
        # add from the parent directory should pick up all file names
150
 
        chdir('..')
151
140
        self.run_bzr('add')
152
141
        self.assertEquals(self.run_bzr('unknowns')[0], '')
153
142
        self.run_bzr('check')
217
206
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
218
207
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
219
208
 
220
 
    def test_add_with_wildcards(self):
221
 
        self.requireFeature(NeedsGlobExpansionFeature)
222
 
        self.make_branch_and_tree('.')
223
 
        self.build_tree(['a1', 'a2', 'b', 'c33'])
224
 
        self.run_bzr(['add', 'a?', 'c*'])
225
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
226
 
 
227
 
    def test_add_with_wildcards_unicode(self):
228
 
        self.requireFeature(NeedsGlobExpansionFeature)
229
 
        self.make_branch_and_tree('.')
230
 
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
231
 
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
232
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
233
 
 
234
209
    def test_add_via_symlink(self):
235
 
        self.requireFeature(SymlinkFeature)
 
210
        self.requireFeature(tests.SymlinkFeature)
236
211
        self.make_branch_and_tree('source')
237
212
        self.build_tree(['source/top.txt'])
238
213
        os.symlink('source', 'link')
240
215
        self.assertEquals(out, 'adding top.txt\n')
241
216
 
242
217
    def test_add_symlink_to_abspath(self):
243
 
        self.requireFeature(SymlinkFeature)
 
218
        self.requireFeature(tests.SymlinkFeature)
244
219
        self.make_branch_and_tree('tree')
245
220
        os.symlink(osutils.abspath('target'), 'tree/link')
246
221
        out = self.run_bzr(['add', 'tree/link'])[0]
247
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
        ''')