← 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: Vincent Ladeuil
  • Date: 2010-10-07 06:08:01 UTC
  • mto: This revision was merged to the branch mainline in revision 5491.
  • Revision ID: v.ladeuil+lp@free.fr-20101007060801-wfdhizfhfmctl8qa
Fix some typos and propose a release planning.

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) 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
24
24
    tests,
25
25
    )
26
26
from bzrlib.tests import (
27
 
    features,
28
27
    script,
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
 
 
30
 
 
31
def load_tests(standard_tests, module, loader):
 
32
    """Parameterize tests for view-aware vs not."""
 
33
    to_adapt, result = tests.split_suite_by_condition(
 
34
        standard_tests, tests.condition_isinstance(TestAdd))
38
35
    scenarios = [
39
36
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
40
 
        ('view-aware', {'branch_tree_format': '2a'}),
 
37
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
41
38
        ]
 
39
    return tests.multiply_tests(to_adapt, scenarios, result)
 
40
 
 
41
 
 
42
class TestAdd(tests.TestCaseWithTransport):
42
43
 
43
44
    def make_branch_and_tree(self, dir):
44
45
        return super(TestAdd, self).make_branch_and_tree(
206
207
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
207
208
 
208
209
    def test_add_via_symlink(self):
209
 
        self.requireFeature(features.SymlinkFeature)
 
210
        self.requireFeature(tests.SymlinkFeature)
210
211
        self.make_branch_and_tree('source')
211
212
        self.build_tree(['source/top.txt'])
212
213
        os.symlink('source', 'link')
214
215
        self.assertEquals(out, 'adding top.txt\n')
215
216
 
216
217
    def test_add_symlink_to_abspath(self):
217
 
        self.requireFeature(features.SymlinkFeature)
 
218
        self.requireFeature(tests.SymlinkFeature)
218
219
        self.make_branch_and_tree('tree')
219
220
        os.symlink(osutils.abspath('target'), 'tree/link')
220
221
        out = self.run_bzr(['add', 'tree/link'])[0]
230
231
        $ bzr add tree1/a tree2/b
231
232
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
232
233
        ''')
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)