~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

MergeĀ fromĀ jam-storage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
190
190
                         branch.repository.revision_store.get('A', 
191
191
                         'sig').read())
192
192
 
193
 
    def test__relcontrolfilename(self):
 
193
    def test__escape(self):
194
194
        branch = Branch.initialize('.')
195
 
        self.assertEqual('.bzr/%25', branch.control_files._rel_controlfilename('%'))
 
195
        self.assertEqual('.bzr/%25', branch.control_files._escape('%'))
196
196
        
197
 
    def test__relcontrolfilename_empty(self):
 
197
    def test__escape_empty(self):
198
198
        branch = Branch.initialize('.')
199
 
        self.assertEqual('.bzr', branch.control_files._rel_controlfilename(''))
 
199
        self.assertEqual('', branch.control_files._escape(''))
200
200
 
201
201
    def test_nicks(self):
202
202
        """Branch nicknames"""