/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 breezy/tests/test_pack.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_pack.py
118
118
    def test_non_empty_end_does_not_add_a_record_to_records_written(self):
119
119
        """The end() method does not count towards the records written."""
120
120
        self.writer.begin()
121
 
        self.writer.add_bytes_record(b'foo', names=[])
 
121
        self.writer.add_bytes_record([b'foo'], len(b'foo'), names=[])
122
122
        self.writer.end()
123
123
        self.assertEqual(1, self.writer.records_written)
124
124
 
125
125
    def test_add_bytes_record_no_name(self):
126
126
        """Add a bytes record with no name."""
127
127
        self.writer.begin()
128
 
        offset, length = self.writer.add_bytes_record(b'abc', names=[])
 
128
        offset, length = self.writer.add_bytes_record([b'abc'], len(b'abc'), names=[])
129
129
        self.assertEqual((42, 7), (offset, length))
130
130
        self.assertOutput(
131
131
            b'Bazaar pack format 1 (introduced in 0.18)\nB3\n\nabc')
135
135
        self.writer.begin()
136
136
 
137
137
        offset, length = self.writer.add_bytes_record(
138
 
            b'abc', names=[(b'name1', )])
 
138
            [b'abc'], len(b'abc'), names=[(b'name1', )])
139
139
        self.assertEqual((42, 13), (offset, length))
140
140
        self.assertOutput(
141
141
            b'Bazaar pack format 1 (introduced in 0.18)\n'
156
156
 
157
157
        self.writer.begin()
158
158
        offset, length = self.writer.add_bytes_record(
159
 
            b'abcabc', names=[(b'name1', )])
 
159
            [b'abcabc'], len(b'abcabc'), names=[(b'name1', )])
160
160
        self.assertEqual((42, 16), (offset, length))
161
161
        self.assertOutput(
162
162
            b'Bazaar pack format 1 (introduced in 0.18)\n'
172
172
        """Add a bytes record with two names."""
173
173
        self.writer.begin()
174
174
        offset, length = self.writer.add_bytes_record(
175
 
            b'abc', names=[(b'name1', ), (b'name2', )])
 
175
            [b'abc'], len(b'abc'), names=[(b'name1', ), (b'name2', )])
176
176
        self.assertEqual((42, 19), (offset, length))
177
177
        self.assertOutput(
178
178
            b'Bazaar pack format 1 (introduced in 0.18)\n'
182
182
        """Add a bytes record with two names."""
183
183
        self.writer.begin()
184
184
        offset, length = self.writer.add_bytes_record(
185
 
            b'abc', names=[(b'name1', ), (b'name2', )])
 
185
            [b'abc'], len(b'abc'), names=[(b'name1', ), (b'name2', )])
186
186
        self.assertEqual((42, 19), (offset, length))
187
187
        self.assertOutput(
188
188
            b'Bazaar pack format 1 (introduced in 0.18)\n'
192
192
        """Add a bytes record with a two-element name."""
193
193
        self.writer.begin()
194
194
        offset, length = self.writer.add_bytes_record(
195
 
            b'abc', names=[(b'name1', b'name2')])
 
195
            [b'abc'], len(b'abc'), names=[(b'name1', b'name2')])
196
196
        self.assertEqual((42, 19), (offset, length))
197
197
        self.assertOutput(
198
198
            b'Bazaar pack format 1 (introduced in 0.18)\n'
200
200
 
201
201
    def test_add_second_bytes_record_gets_higher_offset(self):
202
202
        self.writer.begin()
203
 
        self.writer.add_bytes_record(b'abc', names=[])
204
 
        offset, length = self.writer.add_bytes_record(b'abc', names=[])
 
203
        self.writer.add_bytes_record([b'a', b'bc'], len(b'abc'), names=[])
 
204
        offset, length = self.writer.add_bytes_record([b'abc'], len(b'abc'), names=[])
205
205
        self.assertEqual((49, 7), (offset, length))
206
206
        self.assertOutput(
207
207
            b'Bazaar pack format 1 (introduced in 0.18)\n'
215
215
        self.writer.begin()
216
216
        self.assertRaises(
217
217
            errors.InvalidRecordError,
218
 
            self.writer.add_bytes_record, b'abc', names=[(b'bad name', )])
 
218
            self.writer.add_bytes_record, [b'abc'], len(b'abc'), names=[(b'bad name', )])
219
219
 
220
220
    def test_add_bytes_records_add_to_records_written(self):
221
221
        """Adding a Bytes record increments the records_written counter."""
222
222
        self.writer.begin()
223
 
        self.writer.add_bytes_record(b'foo', names=[])
 
223
        self.writer.add_bytes_record([b'foo'], len(b'foo'), names=[])
224
224
        self.assertEqual(1, self.writer.records_written)
225
 
        self.writer.add_bytes_record(b'foo', names=[])
 
225
        self.writer.add_bytes_record([b'foo'], len(b'foo'), names=[])
226
226
        self.assertEqual(2, self.writer.records_written)
227
227
 
228
228
 
538
538
        writer = pack.ContainerWriter(pack_data.write)
539
539
        writer.begin()
540
540
        memos = []
541
 
        memos.append(writer.add_bytes_record(b'abc', names=[]))
542
 
        memos.append(writer.add_bytes_record(b'def', names=[(b'name1', )]))
543
 
        memos.append(writer.add_bytes_record(b'ghi', names=[(b'name2', )]))
544
 
        memos.append(writer.add_bytes_record(b'jkl', names=[]))
 
541
        memos.append(writer.add_bytes_record([b'abc'], 3, names=[]))
 
542
        memos.append(writer.add_bytes_record([b'def'], 3, names=[(b'name1', )]))
 
543
        memos.append(writer.add_bytes_record([b'ghi'], 3, names=[(b'name2', )]))
 
544
        memos.append(writer.add_bytes_record([b'jkl'], 3, names=[]))
545
545
        writer.end()
546
546
        transport = self.get_transport()
547
547
        transport.put_bytes('mypack', pack_data.getvalue())