/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: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

Show diffs side-by-side

added added

removed removed

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