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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-24 00:39:50 UTC
  • mto: This revision was merged to the branch mainline in revision 7504.
  • Revision ID: jelmer@jelmer.uk-20200524003950-bbc545r76vc5yajg
Add github action.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_weave.py
24
24
from io import BytesIO
25
25
from pprint import pformat
26
26
 
27
 
from ... import (
 
27
from .. import (
28
28
    errors,
29
29
    )
30
 
from ...osutils import sha_string
 
30
from ..osutils import sha_string
31
31
from . import TestCase, TestCaseInTempDir
32
 
from ..weave import Weave, WeaveFormatError, WeaveInvalidChecksum
33
 
from ..weavefile import write_weave, read_weave
 
32
from ..bzr.weave import Weave, WeaveFormatError, WeaveInvalidChecksum
 
33
from ..bzr.weavefile import write_weave, read_weave
34
34
 
35
35
 
36
36
# texts for use in testing
530
530
                         [b"first line",
531
531
                          b"alternative second line"])
532
532
 
533
 
        self.assertEqual(set(k.get_ancestry([b'2'])),
534
 
                         set([b'0', b'2']))
 
533
        self.assertEqual(list(k.get_ancestry([b'2'])),
 
534
                         [b'0', b'2'])
535
535
 
536
536
 
537
537
class ReplaceLine(TestBase):
579
579
                          (b'text2', b'line from 2'),
580
580
                          ])
581
581
 
582
 
        self.assertEqual(set(k.get_ancestry([b'merge'])),
583
 
                         set([b'text0', b'text1', b'text2', b'merge']))
 
582
        self.assertEqual(list(k.get_ancestry([b'merge'])),
 
583
                         [b'text0', b'text1', b'text2', b'merge'])
584
584
 
585
585
        self.log('k._weave=' + pformat(k._weave))
586
586