~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

(vila) Merge 2.1 into 2.2 to pick up fix for lp:686611 (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
217
217
        os.symlink(osutils.abspath('target'), 'tree/link')
218
218
        out = self.run_bzr(['add', 'tree/link'])[0]
219
219
        self.assertEquals(out, 'adding link\n')
 
220
 
 
221
    def test_add_multiple_files_in_unicode_cwd(self):
 
222
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
 
223
        self.requireFeature(tests.UnicodeFilename)
 
224
        self.make_branch_and_tree(u"\xA7")
 
225
        self.build_tree([u"\xA7/a", u"\xA7/b"])
 
226
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
 
227
        self.assertEquals(out, "adding a\n" "adding b\n")
 
228
        self.assertEquals(err, "")