← 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: 2010-02-12 04:33:05 UTC
  • mfrom: (5031 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5032.
  • Revision ID: andrew.bennetts@canonical.com-20100212043305-ujdbsdoviql2t7i3
Merge lp:bzr

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