← 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: 2009-08-03 07:15:11 UTC
  • mfrom: (4580.1.2 408199-check-2a)
  • Revision ID: pqm@pqm.ubuntu.com-20090803071511-dwb041qzak0vjzdk
(mbp) check blackbox tests now handle the root being included in the
        file-id count

Show diffs side-by-side

added added

removed removed

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