← 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: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

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
 
 
31
 
 
32
def load_tests(standard_tests, module, loader):
 
33
    """Parameterize tests for view-aware vs not."""
 
34
    to_adapt, result = split_suite_by_condition(
 
35
        standard_tests, condition_isinstance(TestAdd))
38
36
    scenarios = [
39
37
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
40
 
        ('view-aware', {'branch_tree_format': '2a'}),
 
38
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
41
39
        ]
 
40
    return multiply_tests(to_adapt, scenarios, result)
 
41
 
 
42
 
 
43
class TestAdd(ExternalBase):
42
44
 
43
45
    def make_branch_and_tree(self, dir):
44
 
        return super(TestAdd, self).make_branch_and_tree(
45
 
            dir, format=self.branch_tree_format)
 
46
        return ExternalBase.make_branch_and_tree(self, dir,
 
47
            format=self.branch_tree_format)
46
48
 
47
49
    def test_add_reports(self):
48
50
        """add command prints the names of added files."""
113
115
 
114
116
        eq = self.assertEqual
115
117
        ass = self.assertTrue
 
118
        chdir = os.chdir
116
119
 
117
120
        t = self.make_branch_and_tree('.')
118
121
        b = t.branch
127
130
 
128
131
        # add with no arguments in a subdirectory gets only files below that
129
132
        # subdirectory
130
 
        self.run_bzr('add', working_dir='src')
131
 
        self.assertEquals('README\n',
132
 
                          self.run_bzr('unknowns', working_dir='src')[0])
 
133
        chdir('src')
 
134
        self.run_bzr('add')
 
135
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
133
136
        # reopen to see the new changes
134
 
        t = t.bzrdir.open_workingtree('src')
 
137
        t = t.bzrdir.open_workingtree()
135
138
        versioned = [path for path, entry in t.iter_entries_by_dir()]
136
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
 
139
        self.assertEquals(versioned,
 
140
            ['', 'src', 'src/foo.c'])
137
141
 
138
142
        # add from the parent directory should pick up all file names
 
143
        chdir('..')
139
144
        self.run_bzr('add')
140
145
        self.assertEquals(self.run_bzr('unknowns')[0], '')
141
146
        self.run_bzr('check')
206
211
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
207
212
 
208
213
    def test_add_via_symlink(self):
209
 
        self.requireFeature(features.SymlinkFeature)
 
214
        self.requireFeature(SymlinkFeature)
210
215
        self.make_branch_and_tree('source')
211
216
        self.build_tree(['source/top.txt'])
212
217
        os.symlink('source', 'link')
214
219
        self.assertEquals(out, 'adding top.txt\n')
215
220
 
216
221
    def test_add_symlink_to_abspath(self):
217
 
        self.requireFeature(features.SymlinkFeature)
 
222
        self.requireFeature(SymlinkFeature)
218
223
        self.make_branch_and_tree('tree')
219
224
        os.symlink(osutils.abspath('target'), 'tree/link')
220
225
        out = self.run_bzr(['add', 'tree/link'])[0]
221
226
        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, "")