← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_filesystem_cicp.py
23
23
    osutils,
24
24
    tests,
25
25
    )
26
 
from bzrlib.tests import CaseInsCasePresFilenameFeature, KnownFailure
 
26
from bzrlib.tests import KnownFailure
27
27
from bzrlib.osutils import canonical_relpath, pathjoin
28
28
from bzrlib.tests.script import run_script
 
29
from bzrlib.tests.features import (
 
30
    CaseInsCasePresFilenameFeature,
 
31
    )
 
32
 
29
33
 
30
34
 
31
35
class TestCICPBase(tests.TestCaseWithTransport):
131
135
    def test_mv_newname(self):
132
136
        wt = self._make_mixed_case_tree()
133
137
        run_script(self, """
134
 
            $ bzr add
135
 
            $ bzr ci -m message
 
138
            $ bzr add -q
 
139
            $ bzr ci -qm message
136
140
            $ bzr mv camelcaseparent/camelcase camelcaseparent/NewCamelCase
137
141
            CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase
138
142
            """)
142
146
        # In this case we can specify the incorrect case for the destination,
143
147
        # as we use --after, so the file-system is sniffed.
144
148
        run_script(self, """
145
 
            $ bzr add 
146
 
            $ bzr ci -m message
 
149
            $ bzr add -q
 
150
            $ bzr ci -qm message
147
151
            $ mv CamelCaseParent/CamelCase CamelCaseParent/NewCamelCase
148
152
            $ bzr mv --after camelcaseparent/camelcase camelcaseparent/newcamelcase
149
153
            CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase