/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_xml.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_xml.py
249
249
 
250
250
    def test_unpack_inventory_5a(self):
251
251
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
252
 
                _inventory_v5a, revision_id=b'test-rev-id')
 
252
            _inventory_v5a, revision_id=b'test-rev-id')
253
253
        self.assertEqual(b'test-rev-id', inv.root.revision)
254
254
 
255
255
    def test_unpack_inventory_5a_cache_and_copy(self):
286
286
 
287
287
    def test_unpack_inventory_5b(self):
288
288
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
289
 
                _inventory_v5b, revision_id=b'test-rev-id')
 
289
            _inventory_v5b, revision_id=b'test-rev-id')
290
290
        self.assertEqual(b'a-rev-id', inv.root.revision)
291
291
 
292
292
    def test_repack_inventory_5(self):
295
295
        outp = BytesIO()
296
296
        breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
297
297
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
298
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(BytesIO(outp.getvalue()))
 
298
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
 
299
            BytesIO(outp.getvalue()))
299
300
        self.assertEqual(inv, inv2)
300
301
 
301
302
    def assertRoundTrips(self, xml_string):
307
308
        lines = breezy.bzr.xml5.serializer_v5.write_inventory_to_lines(inv)
308
309
        outp.seek(0)
309
310
        self.assertEqual(outp.readlines(), lines)
310
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(BytesIO(outp.getvalue()))
 
311
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
 
312
            BytesIO(outp.getvalue()))
311
313
        self.assertEqual(inv, inv2)
312
314
 
313
315
    def tests_serialize_inventory_v5_with_root(self):
320
322
        outp = BytesIO()
321
323
        breezy.bzr.xml5.serializer_v5.write_revision(rev, outp)
322
324
        outfile_contents = outp.getvalue()
323
 
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(BytesIO(outfile_contents))
 
325
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(
 
326
            BytesIO(outfile_contents))
324
327
        self.assertEqual(rev, rev2)
325
328
 
326
329
    def test_repack_revision_5(self):
333
336
    def test_pack_revision_5(self):
334
337
        """Pack revision to XML v5"""
335
338
        # fixed 20051025, revisions should have final newline
336
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(_revision_v5)
 
339
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(
 
340
            _revision_v5)
337
341
        outp = BytesIO()
338
342
        breezy.bzr.xml5.serializer_v5.write_revision(rev, outp)
339
343
        outfile_contents = outp.getvalue()
340
344
        self.assertEqual(outfile_contents[-1:], b'\n')
341
 
        self.assertEqualDiff(outfile_contents, breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev))
 
345
        self.assertEqualDiff(
 
346
            outfile_contents, breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev))
342
347
        self.assertEqualDiff(outfile_contents, _expected_rev_v5)
343
348
 
344
349
    def test_empty_property_value(self):
346
351
        s_v5 = breezy.bzr.xml5.serializer_v5
347
352
        rev = s_v5.read_revision_from_string(_revision_v5)
348
353
        outp = BytesIO()
349
 
        props = {'empty':'', 'one':'one'}
 
354
        props = {'empty': '', 'one': 'one'}
350
355
        rev.properties = props
351
356
        txt = s_v5.write_revision_to_string(rev)
352
357
        new_rev = s_v5.read_revision_from_string(txt)
416
421
        lines = s_v7.write_inventory_to_lines(inv)
417
422
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
418
423
        inv2 = s_v7.read_inventory_from_string(txt)
419
 
        self.assertEqual(b'tree-root-321', inv2.get_entry(b'nested-id').parent_id)
 
424
        self.assertEqual(b'tree-root-321',
 
425
                         inv2.get_entry(b'nested-id').parent_id)
420
426
        self.assertEqual(b'rev-outer', inv2.get_entry(b'nested-id').revision)
421
 
        self.assertEqual(b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
 
427
        self.assertEqual(
 
428
            b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
422
429
 
423
430
    def test_roundtrip_inventory_v8(self):
424
431
        inv = self.get_sample_inventory()
439
446
        """Pack revision to XML v6"""
440
447
        rev = breezy.bzr.xml6.serializer_v6.read_revision_from_string(
441
448
            _expected_rev_v5)
442
 
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_string(rev)
 
449
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_string(
 
450
            rev)
443
451
        self.assertEqualDiff(serialized, _expected_rev_v5)
444
452
 
445
453
    def test_revision_text_v7(self):
446
454
        """Pack revision to XML v7"""
447
455
        rev = breezy.bzr.xml7.serializer_v7.read_revision_from_string(
448
456
            _expected_rev_v5)
449
 
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_string(rev)
 
457
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_string(
 
458
            rev)
450
459
        self.assertEqualDiff(serialized, _expected_rev_v5)
451
460
 
452
461
    def test_revision_text_v8(self):
453
462
        """Pack revision to XML v8"""
454
463
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
455
464
            _expected_rev_v8)
456
 
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_string(rev)
 
465
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_string(
 
466
            rev)
457
467
        self.assertEqualDiff(serialized, _expected_rev_v8)
458
468
 
459
469
    def test_revision_ids_are_utf8(self):
480
490
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
481
491
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
482
492
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
483
 
                   ]
 
493
                    ]
484
494
        self.assertEqual(rev_id_2, inv.revision_id)
485
495
        self.assertIsInstance(inv.revision_id, bytes)
486
496