← 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: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import osutils
23
 
from bzrlib.tests import (
24
 
    condition_isinstance,
25
 
    split_suite_by_condition,
26
 
    multiply_tests,
27
 
    SymlinkFeature
 
22
from bzrlib import (
 
23
    osutils,
 
24
    tests,
28
25
    )
29
 
from bzrlib.tests.blackbox import ExternalBase
30
 
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
31
26
 
32
27
 
33
28
def load_tests(standard_tests, module, loader):
34
29
    """Parameterize tests for view-aware vs not."""
35
 
    to_adapt, result = split_suite_by_condition(
36
 
        standard_tests, condition_isinstance(TestAdd))
 
30
    to_adapt, result = tests.split_suite_by_condition(
 
31
        standard_tests, tests.condition_isinstance(TestAdd))
37
32
    scenarios = [
38
33
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
34
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
40
35
        ]
41
 
    return multiply_tests(to_adapt, scenarios, result)
42
 
 
43
 
 
44
 
class TestAdd(ExternalBase):
 
36
    return tests.multiply_tests(to_adapt, scenarios, result)
 
37
 
 
38
 
 
39
class TestAdd(tests.TestCaseWithTransport):
45
40
 
46
41
    def make_branch_and_tree(self, dir):
47
 
        return ExternalBase.make_branch_and_tree(self, dir,
48
 
            format=self.branch_tree_format)
 
42
        return super(TestAdd, self).make_branch_and_tree(
 
43
            dir, format=self.branch_tree_format)
49
44
 
50
45
    def test_add_reports(self):
51
46
        """add command prints the names of added files."""
116
111
 
117
112
        eq = self.assertEqual
118
113
        ass = self.assertTrue
119
 
        chdir = os.chdir
120
114
 
121
115
        t = self.make_branch_and_tree('.')
122
116
        b = t.branch
131
125
 
132
126
        # add with no arguments in a subdirectory gets only files below that
133
127
        # subdirectory
134
 
        chdir('src')
135
 
        self.run_bzr('add')
136
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
 
128
        self.run_bzr('add', working_dir='src')
 
129
        self.assertEquals('README\n',
 
130
                          self.run_bzr('unknowns', working_dir='src')[0])
137
131
        # reopen to see the new changes
138
 
        t = t.bzrdir.open_workingtree()
 
132
        t = t.bzrdir.open_workingtree('src')
139
133
        versioned = [path for path, entry in t.iter_entries_by_dir()]
140
 
        self.assertEquals(versioned,
141
 
            ['', 'src', 'src/foo.c'])
 
134
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
142
135
 
143
136
        # add from the parent directory should pick up all file names
144
 
        chdir('..')
145
137
        self.run_bzr('add')
146
138
        self.assertEquals(self.run_bzr('unknowns')[0], '')
147
139
        self.run_bzr('check')
211
203
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
212
204
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
213
205
 
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
 
 
228
206
    def test_add_via_symlink(self):
229
 
        self.requireFeature(SymlinkFeature)
 
207
        self.requireFeature(tests.SymlinkFeature)
230
208
        self.make_branch_and_tree('source')
231
209
        self.build_tree(['source/top.txt'])
232
210
        os.symlink('source', 'link')
234
212
        self.assertEquals(out, 'adding top.txt\n')
235
213
 
236
214
    def test_add_symlink_to_abspath(self):
237
 
        self.requireFeature(SymlinkFeature)
 
215
        self.requireFeature(tests.SymlinkFeature)
238
216
        self.make_branch_and_tree('tree')
239
217
        os.symlink(osutils.abspath('target'), 'tree/link')
240
218
        out = self.run_bzr(['add', 'tree/link'])[0]