← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Andrew Bennetts
  • Date: 2007-04-13 06:18:40 UTC
  • mto: (2018.18.11 hpss-faster-copy)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: andrew.bennetts@canonical.com-20070413061840-gb25wprbcivfeyuo
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
199
199
        tree.lock_write()
200
200
        tree.add('')
201
201
        r1 = tree.commit('1st commit')
202
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8')
 
202
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
203
203
        tree.unlock()
204
204
        self.assertEqual(
205
205
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
243
243
        tree = self.make_branch_and_memory_tree('.')
244
244
        tree.lock_write()
245
245
        tree.add('')
246
 
        rev_id = u'\xc8'
247
 
        rev_id_utf8 = rev_id.encode('utf-8')
 
246
        rev_id_utf8 = u'\xc8'.encode('utf-8')
248
247
        r1 = tree.commit('1st commit')
249
 
        r2 = tree.commit('2nd commit', rev_id=rev_id)
 
248
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
250
249
        tree.unlock()
251
250
        self.assertEqual(
252
251
            SmartServerResponse(('ok', '2', rev_id_utf8)),
316
315
        tree = self.make_branch_and_memory_tree('.')
317
316
        tree.lock_write()
318
317
        tree.add('')
319
 
        rev_id = u'\xc8'
320
 
        rev_id_utf8 = rev_id.encode('utf-8')
321
 
        r1 = tree.commit('1st commit', rev_id=rev_id)
 
318
        rev_id_utf8 = u'\xc8'.encode('utf-8')
 
319
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
322
320
        r2 = tree.commit('2nd commit')
323
321
        tree.unlock()
324
322
        branch_token = tree.branch.lock_write()
340
338
        tree = self.make_branch_and_memory_tree('.')
341
339
        tree.lock_write()
342
340
        tree.add('')
343
 
        rev_id = u'\xc8'
344
 
        rev_id_utf8 = rev_id.encode('utf-8')
345
 
        r1 = tree.commit('1st commit', rev_id=rev_id)
 
341
        rev_id_utf8 = u'\xc8'.encode('utf-8')
 
342
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
346
343
        r2 = tree.commit('2nd commit')
347
344
        tree.unlock()
348
345
        tree.branch.set_revision_history([])
522
519
        tree.lock_write()
523
520
        tree.add('')
524
521
        r1 = tree.commit('1st commit')
525
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8')
 
522
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
526
523
        tree.unlock()
527
524
 
528
525
        # the lines of revision_id->revision_parent_list has no guaranteed
540
537
        tree = self.make_branch_and_memory_tree('.')
541
538
        tree.lock_write()
542
539
        tree.add('')
543
 
        r1 = tree.commit('1st commit', rev_id=u'\xc9')
544
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8')
 
540
        rev_id_utf8 = u'\xc9'.encode('utf-8')
 
541
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
 
542
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
545
543
        tree.unlock()
546
544
 
547
 
        self.assertEqual(SmartServerResponse(('ok', ),
548
 
            u'\xc9'.encode('utf8')),
549
 
            request.execute(backing.local_abspath(''), u'\xc9'.encode('utf8')))
 
545
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
 
546
            request.execute(backing.local_abspath(''), rev_id_utf8))
550
547
    
551
548
    def test_no_such_revision(self):
552
549
        backing = self.get_transport()
580
577
        tree = self.make_branch_and_memory_tree('.')
581
578
        tree.lock_write()
582
579
        tree.add('')
583
 
        r1 = tree.commit('a commit', rev_id=u'\xc8abc')
 
580
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
 
581
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
584
582
        tree.unlock()
585
 
        self.assertTrue(tree.branch.repository.has_revision(u'\xc8abc'))
 
583
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
586
584
        self.assertEqual(SmartServerResponse(('ok', )),
587
 
            request.execute(backing.local_abspath(''),
588
 
                u'\xc8abc'.encode('utf8')))
 
585
            request.execute(backing.local_abspath(''), rev_id_utf8))
589
586
 
590
587
 
591
588
class TestSmartServerRepositoryGatherStats(tests.TestCaseWithTransport):
604
601
    def test_revid_with_committers(self):
605
602
        """For a revid we get more infos."""
606
603
        backing = self.get_transport()
607
 
        rev_id = u'\xc8abc'
 
604
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
608
605
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
609
606
        tree = self.make_branch_and_memory_tree('.')
610
607
        tree.lock_write()
611
608
        tree.add('')
612
609
        # Let's build a predictable result
613
610
        tree.commit('a commit', timestamp=123456.2, timezone=3600)
614
 
        tree.commit('a commit', timestamp=654321.4, timezone=0, rev_id=rev_id)
 
611
        tree.commit('a commit', timestamp=654321.4, timezone=0,
 
612
                    rev_id=rev_id_utf8)
615
613
        tree.unlock()
616
614
 
617
615
        stats = tree.branch.repository.gather_stats()
622
620
                         'size: %d\n' % size)
623
621
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
624
622
                         request.execute(backing.local_abspath(''),
625
 
                                         rev_id.encode('utf8'), 'no'))
 
623
                                         rev_id_utf8, 'no'))
626
624
 
627
625
    def test_not_empty_repository_with_committers(self):
628
626
        """For a revid and requesting committers we get the whole thing."""
629
627
        backing = self.get_transport()
630
 
        rev_id = u'\xc8abc'
 
628
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
631
629
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
632
630
        tree = self.make_branch_and_memory_tree('.')
633
631
        tree.lock_write()
636
634
        tree.commit('a commit', timestamp=123456.2, timezone=3600,
637
635
                    committer='foo')
638
636
        tree.commit('a commit', timestamp=654321.4, timezone=0,
639
 
                    committer='bar', rev_id=rev_id)
 
637
                    committer='bar', rev_id=rev_id_utf8)
640
638
        tree.unlock()
641
639
        stats = tree.branch.repository.gather_stats()
642
640
 
648
646
                         'size: %d\n' % size)
649
647
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
650
648
                         request.execute(backing.local_abspath(''),
651
 
                                         rev_id.encode('utf8'), 'yes'))
 
649
                                         rev_id_utf8, 'yes'))
652
650
 
653
651
 
654
652
class TestSmartServerRepositoryIsShared(tests.TestCaseWithTransport):