← 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: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
24
24
    tests,
25
25
    )
26
26
from bzrlib.tests import (
 
27
    features,
27
28
    script,
28
29
    )
29
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
205
206
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
206
207
 
207
208
    def test_add_via_symlink(self):
208
 
        self.requireFeature(tests.SymlinkFeature)
 
209
        self.requireFeature(features.SymlinkFeature)
209
210
        self.make_branch_and_tree('source')
210
211
        self.build_tree(['source/top.txt'])
211
212
        os.symlink('source', 'link')
213
214
        self.assertEquals(out, 'adding top.txt\n')
214
215
 
215
216
    def test_add_symlink_to_abspath(self):
216
 
        self.requireFeature(tests.SymlinkFeature)
 
217
        self.requireFeature(features.SymlinkFeature)
217
218
        self.make_branch_and_tree('tree')
218
219
        os.symlink(osutils.abspath('target'), 'tree/link')
219
220
        out = self.run_bzr(['add', 'tree/link'])[0]
232
233
 
233
234
    def test_add_multiple_files_in_unicode_cwd(self):
234
235
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
235
 
        self.requireFeature(tests.UnicodeFilename)
 
236
        self.requireFeature(features.UnicodeFilenameFeature)
236
237
        self.make_branch_and_tree(u"\xA7")
237
238
        self.build_tree([u"\xA7/a", u"\xA7/b"])
238
239
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")