← 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: 2009-06-05 23:15:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4565.
  • Revision ID: mbp@sourcefrog.net-20090605231523-fzaebdzckp38hoir
Remove one use of DummyProgress

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., 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
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
24
31
 
25
32
 
 
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
 
26
44
class TestAdd(ExternalBase):
27
 
        
 
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
 
28
50
    def test_add_reports(self):
29
51
        """add command prints the names of added files."""
30
52
        tree = self.make_branch_and_tree('.')
33
55
        out = self.run_bzr('add')[0]
34
56
        # the ordering is not defined at the moment
35
57
        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
 
                           'added .bzrignore',
39
 
                           'added dir',
40
 
                           'added dir/sub.txt',
41
 
                           'added top.txt',
 
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',
42
65
                           'ignored 1 file(s).'],
43
66
                          results)
44
67
        out = self.run_bzr('add -v')[0]
45
68
        results = sorted(out.rstrip('\n').split('\n'))
46
 
        self.assertEquals(['If you wish to add some of these files, please'\
47
 
                           ' add them by name.',
 
69
        self.assertEquals(['If you wish to add ignored files, '\
 
70
                           'please add them explicitly by name. ("bzr ignored" gives a list)',
48
71
                           'ignored CVS matching "CVS"'],
49
72
                          results)
50
73
 
51
74
    def test_add_quiet_is(self):
52
75
        """add -q does not print the names of added files."""
53
 
        tree = self.make_branch_and_tree('.') 
 
76
        tree = self.make_branch_and_tree('.')
54
77
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
55
78
        out = self.run_bzr('add -q')[0]
56
79
        # the ordering is not defined at the moment
100
123
        eq = self.assertEqual
101
124
        ass = self.assertTrue
102
125
        chdir = os.chdir
103
 
        
 
126
 
104
127
        t = self.make_branch_and_tree('.')
105
128
        b = t.branch
106
129
        self.build_tree(['src/', 'README'])
107
 
        
 
130
 
108
131
        eq(sorted(t.unknowns()),
109
132
           ['README', 'src'])
110
 
        
 
133
 
111
134
        self.run_bzr('add src')
112
 
        
 
135
 
113
136
        self.build_tree(['src/foo.c'])
114
 
        
 
137
 
115
138
        # add with no arguments in a subdirectory gets only files below that
116
139
        # subdirectory
117
140
        chdir('src')
122
145
        versioned = [path for path, entry in t.iter_entries_by_dir()]
123
146
        self.assertEquals(versioned,
124
147
            ['', 'src', 'src/foo.c'])
125
 
                
 
148
 
126
149
        # add from the parent directory should pick up all file names
127
150
        chdir('..')
128
151
        self.run_bzr('add')
146
169
        os.chdir('new')
147
170
        out, err = self.run_bzr('add --file-ids-from ../base')
148
171
        self.assertEqual('', err)
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',
 
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',
152
175
                             out)
153
176
        new_tree = new_tree.bzrdir.open_workingtree()
154
177
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
167
190
        os.chdir('new')
168
191
        out, err = self.run_bzr('add --file-ids-from ../base/b')
169
192
        self.assertEqual('', err)
170
 
        self.assertEqualDiff('added c w/ file id from b/c\n'
171
 
                             'added d w/ file id from b/d\n',
 
193
        self.assertEqualDiff('adding c w/ file id from b/c\n'
 
194
                             'adding d w/ file id from b/d\n',
172
195
                             out)
173
196
 
174
197
        new_tree = new_tree.bzrdir.open_workingtree()
207
230
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
208
231
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
209
232
        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')