~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tests/test_serialize_transform.py

Merge with serialize-transform

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import transform
 
19
from bzrlib import pack, transform
20
20
from bzrlib.plugins.shelf2.serialize_transform import (serialize, deserialize)
21
21
from bzrlib import tests
22
22
 
30
30
        self.addCleanup(tt2.finalize)
31
31
        return tt, tt2
32
32
 
 
33
    @staticmethod
 
34
    def reserialize(tt, tt2):
 
35
        serializer = pack.ContainerSerialiser()
 
36
        parser = pack.ContainerPushParser()
 
37
        parser.accept_bytes(serializer.begin())
 
38
        for bytes in serialize(tt, serializer):
 
39
            parser.accept_bytes(bytes)
 
40
        parser.accept_bytes(serializer.end())
 
41
        deserialize(tt2, iter(parser.read_pending_records()))
 
42
 
33
43
    def test_roundtrip_creation(self):
34
44
        tree = self.make_branch_and_tree('.')
35
45
        tt, tt2 = self.get_two_previews(tree)
36
46
        tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
37
47
        tt.new_directory('qux', tt.root, 'quxx')
38
 
        deserialize(tt2, serialize(tt))
 
48
        self.reserialize(tt, tt2)
39
49
        self.assertEqual(3, tt2._id_number)
40
50
        self.assertEqual({'new-1': u'foo\u1234',
41
51
                          'new-2': 'qux'}, tt2._new_name)
57
67
        tree = self.make_branch_and_tree('.')
58
68
        tt, tt2 = self.get_two_previews(tree)
59
69
        tt.new_symlink('foo', tt.root, 'bar')
60
 
        deserialize(tt2, serialize(tt))
 
70
        self.reserialize(tt, tt2)
61
71
        foo_content = os.readlink(tt2._limbo_name('new-1'))
62
72
        self.assertEqual('bar', foo_content)
63
73
 
70
80
        tt.unversion_file(foo_trans_id)
71
81
        bar_trans_id = tt.trans_id_tree_file_id('bar-id')
72
82
        tt.delete_contents(bar_trans_id)
73
 
        deserialize(tt2, serialize(tt))
 
83
        self.reserialize(tt, tt2)
74
84
        self.assertEqual({u'foo\u1234': foo_trans_id,
75
85
                          'bar': bar_trans_id,
76
86
                          '': tt.root}, tt2._tree_path_ids)
84
94
        tree = self.make_branch_and_tree('.')
85
95
        tt, tt2 = self.get_two_previews(tree)
86
96
        boo_trans_id = tt.trans_id_file_id('boo')
87
 
        deserialize(tt2, serialize(tt))
 
97
        self.reserialize(tt, tt2)
88
98
        self.assertEqual({'boo': boo_trans_id}, tt2._non_present_ids)