← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-19 05:46:31 UTC
  • mfrom: (1714.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060519054631-77bbfb6756845888
Merge reductions in overhead during smart_add. (Robert Collins).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
234
234
        os.mkdir('lala.OTHER')
235
235
        expected = ContentsConflict('lala', file_id='lala-id')
236
236
        self.assertEqual(list(tree.conflicts()), [expected])
 
237
 
 
238
 
 
239
class TestNonFormatSpecific(TestCaseWithTransport):
 
240
    
 
241
    def test_gen_file_id(self):
 
242
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('bar'), 'bar-')
 
243
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('Mwoo oof\t m'), 'Mwoooofm-')
 
244
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('..gam.py'), 'gam.py-')
 
245
        self.assertStartsWith(bzrlib.workingtree.gen_file_id('..Mwoo oof\t m'), 'Mwoooofm-')
 
246
 
 
247
    def test_next_id_suffix(self):
 
248
        bzrlib.workingtree._gen_id_suffix = None
 
249
        bzrlib.workingtree._next_id_suffix()
 
250
        self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)
 
251
        bzrlib.workingtree._gen_id_suffix = "foo-"
 
252
        bzrlib.workingtree._gen_id_serial = 1
 
253
        self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())
 
254
        self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())
 
255
        self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())
 
256
        self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())
 
257
        self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())
 
258
        self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())
 
259
        self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())
 
260
        self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())
 
261
        self.assertEqual("foo-10", bzrlib.workingtree._next_id_suffix())