← 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: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

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