← 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: 2010-12-16 20:41:47 UTC
  • mfrom: (5050.58.4 2.2)
  • mto: This revision was merged to the branch mainline in revision 5574.
  • Revision ID: gzlist@googlemail.com-20101216204147-aquetqr5v8pilrzx
Merge 2.2 for fixes to lp:686611 and lp:687653

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
229
229
        $ bzr add tree1/a tree2/b
230
230
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
231
231
        ''')
 
232
 
 
233
    def test_add_multiple_files_in_unicode_cwd(self):
 
234
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
 
235
        self.requireFeature(tests.UnicodeFilename)
 
236
        self.make_branch_and_tree(u"\xA7")
 
237
        self.build_tree([u"\xA7/a", u"\xA7/b"])
 
238
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
 
239
        self.assertEquals(out, "adding a\n" "adding b\n")
 
240
        self.assertEquals(err, "")