/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_chk_serializer.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_chk_serializer.py
1
 
# Copyright (C) 2009, 2010, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from ..bzr.chk_serializer import (
 
17
from cStringIO import StringIO
 
18
 
 
19
from bzrlib import (
 
20
    errors,
 
21
    revision,
 
22
    serializer,
 
23
    )
 
24
from bzrlib.chk_serializer import (
18
25
    chk_bencode_serializer,
19
26
    )
20
 
from ..revision import (
 
27
from bzrlib.revision import (
21
28
    Revision,
22
29
    )
23
 
from . import TestCase
24
 
 
25
 
_working_revision_bencode1 = (b'l'
26
 
                              b'l6:formati10ee'
27
 
                              b'l9:committer54:Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>e'
28
 
                              b'l8:timezonei3600ee'
29
 
                              b'l10:propertiesd11:branch-nick6:+trunkee'
30
 
                              b'l9:timestamp14:1242300770.844e'
31
 
                              b'l11:revision-id50:pqm@pqm.ubuntu.com-20090514113250-jntkkpminfn3e0tze'
32
 
                              b'l10:parent-ids'
33
 
                              b'l'
34
 
                              b'50:pqm@pqm.ubuntu.com-20090514104039-kggemn7lrretzpvc'
35
 
                              b'48:jelmer@samba.org-20090510012654-jp9ufxquekaokbeo'
36
 
                              b'ee'
37
 
                              b'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
38
 
                              b'l7:message35:(Jelmer) Move dpush to InterBranch.e'
39
 
                              b'e')
40
 
 
41
 
_working_revision_bencode1_no_timezone = (b'l'
42
 
                                          b'l6:formati10ee'
43
 
                                          b'l9:committer54:Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>e'
44
 
                                          b'l9:timestamp14:1242300770.844e'
45
 
                                          b'l10:propertiesd11:branch-nick6:+trunkee'
46
 
                                          b'l11:revision-id50:pqm@pqm.ubuntu.com-20090514113250-jntkkpminfn3e0tze'
47
 
                                          b'l10:parent-ids'
48
 
                                          b'l'
49
 
                                          b'50:pqm@pqm.ubuntu.com-20090514104039-kggemn7lrretzpvc'
50
 
                                          b'48:jelmer@samba.org-20090510012654-jp9ufxquekaokbeo'
51
 
                                          b'ee'
52
 
                                          b'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
53
 
                                          b'l7:message35:(Jelmer) Move dpush to InterBranch.e'
54
 
                                          b'e')
 
30
from bzrlib.tests import TestCase
 
31
 
 
32
_working_revision_bencode1 = ('l'
 
33
    'l6:formati10ee'
 
34
    'l9:committer54:Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>e'
 
35
    'l8:timezonei3600ee'
 
36
    'l10:propertiesd11:branch-nick6:+trunkee'
 
37
    'l9:timestamp14:1242300770.844e'
 
38
    'l11:revision-id50:pqm@pqm.ubuntu.com-20090514113250-jntkkpminfn3e0tze'
 
39
    'l10:parent-ids'
 
40
        'l'
 
41
        '50:pqm@pqm.ubuntu.com-20090514104039-kggemn7lrretzpvc'
 
42
        '48:jelmer@samba.org-20090510012654-jp9ufxquekaokbeo'
 
43
        'ee'
 
44
    'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
 
45
    'l7:message35:(Jelmer) Move dpush to InterBranch.e'
 
46
    'e')
 
47
 
 
48
_working_revision_bencode1_no_timezone = ('l'
 
49
    'l6:formati10ee'
 
50
    'l9:committer54:Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>e'
 
51
    'l9:timestamp14:1242300770.844e'
 
52
    'l10:propertiesd11:branch-nick6:+trunkee'
 
53
    'l11:revision-id50:pqm@pqm.ubuntu.com-20090514113250-jntkkpminfn3e0tze'
 
54
    'l10:parent-ids'
 
55
        'l'
 
56
        '50:pqm@pqm.ubuntu.com-20090514104039-kggemn7lrretzpvc'
 
57
        '48:jelmer@samba.org-20090510012654-jp9ufxquekaokbeo'
 
58
        'ee'
 
59
    'l14:inventory-sha140:4a2c7fb50e077699242cf6eb16a61779c7b680a7e'
 
60
    'l7:message35:(Jelmer) Move dpush to InterBranch.e'
 
61
    'e')
55
62
 
56
63
 
57
64
class TestBEncodeSerializer1(TestCase):
60
67
    def test_unpack_revision(self):
61
68
        """Test unpacking a revision"""
62
69
        rev = chk_bencode_serializer.read_revision_from_string(
63
 
            _working_revision_bencode1)
64
 
        self.assertEqual(rev.committer,
65
 
                         "Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>")
66
 
        self.assertEqual(rev.inventory_sha1,
67
 
                         b"4a2c7fb50e077699242cf6eb16a61779c7b680a7")
68
 
        self.assertEqual([b"pqm@pqm.ubuntu.com-20090514104039-kggemn7lrretzpvc",
69
 
                          b"jelmer@samba.org-20090510012654-jp9ufxquekaokbeo"],
70
 
                         rev.parent_ids)
71
 
        self.assertEqual("(Jelmer) Move dpush to InterBranch.", rev.message)
72
 
        self.assertEqual(b"pqm@pqm.ubuntu.com-20090514113250-jntkkpminfn3e0tz",
73
 
                         rev.revision_id)
74
 
        self.assertEqual({u"branch-nick": u"+trunk"}, rev.properties)
75
 
        self.assertEqual(3600, rev.timezone)
 
70
                _working_revision_bencode1)
 
71
        self.assertEquals(rev.committer,
 
72
           "Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>")
 
73
        self.assertEquals(rev.inventory_sha1,
 
74
           "4a2c7fb50e077699242cf6eb16a61779c7b680a7")
 
75
        self.assertEquals(["pqm@pqm.ubuntu.com-20090514104039-kggemn7lrretzpvc",
 
76
            "jelmer@samba.org-20090510012654-jp9ufxquekaokbeo"],
 
77
            rev.parent_ids)
 
78
        self.assertEquals("(Jelmer) Move dpush to InterBranch.", rev.message)
 
79
        self.assertEquals("pqm@pqm.ubuntu.com-20090514113250-jntkkpminfn3e0tz",
 
80
           rev.revision_id)
 
81
        self.assertEquals({"branch-nick": u"+trunk"}, rev.properties)
 
82
        self.assertEquals(3600, rev.timezone)
76
83
 
77
84
    def test_written_form_matches(self):
78
85
        rev = chk_bencode_serializer.read_revision_from_string(
79
 
            _working_revision_bencode1)
 
86
                _working_revision_bencode1)
80
87
        as_str = chk_bencode_serializer.write_revision_to_string(rev)
81
88
        self.assertEqualDiff(_working_revision_bencode1, as_str)
82
89
 
83
90
    def test_unpack_revision_no_timezone(self):
84
91
        rev = chk_bencode_serializer.read_revision_from_string(
85
92
            _working_revision_bencode1_no_timezone)
86
 
        self.assertEqual(None, rev.timezone)
 
93
        self.assertEquals(None, rev.timezone)
87
94
 
88
95
    def assertRoundTrips(self, serializer, orig_rev):
89
 
        lines = serializer.write_revision_to_lines(orig_rev)
90
 
        new_rev = serializer.read_revision_from_string(b''.join(lines))
91
 
        self.assertEqual(orig_rev, new_rev)
 
96
        text = serializer.write_revision_to_string(orig_rev)
 
97
        new_rev = serializer.read_revision_from_string(text)
 
98
        self.assertEquals(orig_rev, new_rev)
92
99
 
93
100
    def test_roundtrips_non_ascii(self):
94
 
        rev = Revision(b"revid1")
 
101
        rev = Revision("revid1")
95
102
        rev.message = u"\n\xe5me"
96
103
        rev.committer = u'Erik B\xe5gfors'
97
104
        rev.timestamp = 1242385452
98
 
        rev.inventory_sha1 = b"4a2c7fb50e077699242cf6eb16a61779c7b680a7"
 
105
        rev.inventory_sha1 = "4a2c7fb50e077699242cf6eb16a61779c7b680a7"
99
106
        rev.timezone = 3600
100
107
        self.assertRoundTrips(chk_bencode_serializer, rev)
101
108
 
102
109
    def test_roundtrips_xml_invalid_chars(self):
103
 
        rev = Revision(b"revid1")
 
110
        rev = Revision("revid1")
104
111
        rev.message = "\t\ue000"
105
112
        rev.committer = u'Erik B\xe5gfors'
106
113
        rev.timestamp = 1242385452
107
114
        rev.timezone = 3600
108
 
        rev.inventory_sha1 = b"4a2c7fb50e077699242cf6eb16a61779c7b680a7"
 
115
        rev.inventory_sha1 = "4a2c7fb50e077699242cf6eb16a61779c7b680a7"
109
116
        self.assertRoundTrips(chk_bencode_serializer, rev)