← 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: Andrew Bennetts
  • Date: 2009-09-08 08:09:25 UTC
  • mto: (4634.6.27 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090908080925-ccmjw4kzzz7bepg7
Fix more tests to cope with new commit_write_group strictness.

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, 2011 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
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
 
    features,
28
 
    script,
 
24
    condition_isinstance,
 
25
    split_suite_by_condition,
 
26
    multiply_tests,
 
27
    SymlinkFeature
29
28
    )
30
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
31
 
 
32
 
 
33
 
load_tests = load_tests_apply_scenarios
34
 
 
35
 
 
36
 
class TestAdd(tests.TestCaseWithTransport):
37
 
 
 
29
from bzrlib.tests.blackbox import ExternalBase
 
30
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
 
31
 
 
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))
38
37
    scenarios = [
39
38
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
40
 
        ('view-aware', {'branch_tree_format': '2a'}),
 
39
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
41
40
        ]
 
41
    return multiply_tests(to_adapt, scenarios, result)
 
42
 
 
43
 
 
44
class TestAdd(ExternalBase):
42
45
 
43
46
    def make_branch_and_tree(self, dir):
44
 
        return super(TestAdd, self).make_branch_and_tree(
45
 
            dir, format=self.branch_tree_format)
 
47
        return ExternalBase.make_branch_and_tree(self, dir,
 
48
            format=self.branch_tree_format)
46
49
 
47
50
    def test_add_reports(self):
48
51
        """add command prints the names of added files."""
113
116
 
114
117
        eq = self.assertEqual
115
118
        ass = self.assertTrue
 
119
        chdir = os.chdir
116
120
 
117
121
        t = self.make_branch_and_tree('.')
118
122
        b = t.branch
127
131
 
128
132
        # add with no arguments in a subdirectory gets only files below that
129
133
        # subdirectory
130
 
        self.run_bzr('add', working_dir='src')
131
 
        self.assertEquals('README\n',
132
 
                          self.run_bzr('unknowns', working_dir='src')[0])
 
134
        chdir('src')
 
135
        self.run_bzr('add')
 
136
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
133
137
        # reopen to see the new changes
134
 
        t = t.bzrdir.open_workingtree('src')
 
138
        t = t.bzrdir.open_workingtree()
135
139
        versioned = [path for path, entry in t.iter_entries_by_dir()]
136
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
 
140
        self.assertEquals(versioned,
 
141
            ['', 'src', 'src/foo.c'])
137
142
 
138
143
        # add from the parent directory should pick up all file names
 
144
        chdir('..')
139
145
        self.run_bzr('add')
140
146
        self.assertEquals(self.run_bzr('unknowns')[0], '')
141
147
        self.run_bzr('check')
205
211
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
206
212
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
207
213
 
 
214
    def test_add_with_wildcards(self):
 
215
        self.requireFeature(NeedsGlobExpansionFeature)
 
216
        self.make_branch_and_tree('.')
 
217
        self.build_tree(['a1', 'a2', 'b', 'c33'])
 
218
        self.run_bzr(['add', 'a?', 'c*'])
 
219
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
 
220
 
 
221
    def test_add_with_wildcards_unicode(self):
 
222
        self.requireFeature(NeedsGlobExpansionFeature)
 
223
        self.make_branch_and_tree('.')
 
224
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
 
225
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
 
226
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
 
227
 
208
228
    def test_add_via_symlink(self):
209
 
        self.requireFeature(features.SymlinkFeature)
 
229
        self.requireFeature(SymlinkFeature)
210
230
        self.make_branch_and_tree('source')
211
231
        self.build_tree(['source/top.txt'])
212
232
        os.symlink('source', 'link')
214
234
        self.assertEquals(out, 'adding top.txt\n')
215
235
 
216
236
    def test_add_symlink_to_abspath(self):
217
 
        self.requireFeature(features.SymlinkFeature)
 
237
        self.requireFeature(SymlinkFeature)
218
238
        self.make_branch_and_tree('tree')
219
239
        os.symlink(osutils.abspath('target'), 'tree/link')
220
240
        out = self.run_bzr(['add', 'tree/link'])[0]
221
241
        self.assertEquals(out, 'adding link\n')
222
 
 
223
 
    def test_add_not_child(self):
224
 
        # https://bugs.launchpad.net/bzr/+bug/98735
225
 
        sr = script.ScriptRunner()
226
 
        self.make_branch_and_tree('tree1')
227
 
        self.make_branch_and_tree('tree2')
228
 
        self.build_tree(['tree1/a', 'tree2/b'])
229
 
        sr.run_script(self, '''
230
 
        $ bzr add tree1/a tree2/b
231
 
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
232
 
        ''')
233
 
 
234
 
    def test_add_multiple_files_in_unicode_cwd(self):
235
 
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
236
 
        self.requireFeature(features.UnicodeFilenameFeature)
237
 
        self.make_branch_and_tree(u"\xA7")
238
 
        self.build_tree([u"\xA7/a", u"\xA7/b"])
239
 
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
240
 
        self.assertEquals(out, "adding a\n" "adding b\n")
241
 
        self.assertEquals(err, "")
242
 
        
243
 
    def test_add_skip_large_files(self):
244
 
        """Test skipping files larger than add.maximum_file_size"""
245
 
        tree = self.make_branch_and_tree('.')
246
 
        self.build_tree(['small.txt', 'big.txt', 'big2.txt'])
247
 
        self.build_tree_contents([('small.txt', '0\n')])
248
 
        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
249
 
        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
250
 
        tree.branch.get_config().set_user_option('add.maximum_file_size', 5)
251
 
        out = self.run_bzr('add')[0]
252
 
        results = sorted(out.rstrip('\n').split('\n'))
253
 
        self.assertEquals(['adding small.txt'], 
254
 
                          results)
255
 
        # named items never skipped, even if over max
256
 
        out, err = self.run_bzr(["add", "big2.txt"])
257
 
        results = sorted(out.rstrip('\n').split('\n'))
258
 
        self.assertEquals(['adding big2.txt'], 
259
 
                          results)
260
 
        self.assertEquals(err, "")
261
 
        tree.branch.get_config().set_user_option('add.maximum_file_size', 30)
262
 
        out = self.run_bzr('add')[0]
263
 
        results = sorted(out.rstrip('\n').split('\n'))
264
 
        self.assertEquals(['adding big.txt'], 
265
 
                          results)