← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
855
855
        self.assertContainsRe(err,
856
856
            'Branch.*test_checkout.*appears to be bound to itself')
857
857
 
 
858
    def test_mv_dirs_non_ascii(self):
 
859
        """Move directory with non-ascii name and containing files.
 
860
 
 
861
        Regression test for bug 185211.
 
862
        """
 
863
        tree = self.make_branch_and_tree('.')
 
864
        self.build_tree([u'abc\xc3/', u'abc\xc3/foo'])
 
865
 
 
866
        tree.add([u'abc\xc3/', u'abc\xc3/foo'])
 
867
        tree.commit('checkin')
 
868
 
 
869
        tree.rename_one(u'abc\xc3','abc')
 
870
 
 
871
        self.run_bzr('ci -m "non-ascii mv"')
 
872
 
858
873
 
859
874
class TestSmartServerCommit(TestCaseWithTransport):
860
875
 
874
889
        # being too low. If rpc_count increases, more network roundtrips have
875
890
        # become necessary for this use case. Please do not adjust this number
876
891
        # upwards without agreement from bzr's network support maintainers.
877
 
        self.assertLength(211, self.hpss_calls)
 
892
        self.assertLength(214, self.hpss_calls)
 
893
        self.assertLength(2, self.hpss_connections)
878
894
        self.expectFailure("commit still uses VFS calls",
879
895
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)