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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bisect_multi.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Tests for bisect_multi."""
18
18
 
19
 
from bzrlib import errors
20
 
from bzrlib.bisect_multi import bisect_multi_bytes
21
 
from bzrlib.tests import TestCase
 
19
from ..bisect_multi import bisect_multi_bytes
 
20
from . import TestCase
22
21
 
23
22
 
24
23
class TestBisectMultiBytes(TestCase):
85
84
        # steps in the worst case there.
86
85
        self.assertEqual([],
87
86
            list(bisect_multi_bytes(
88
 
                missing_first_content,268435456 - 1 , ['foo', 'bar'])))
 
87
                missing_first_content, 268435456 - 1, ['foo', 'bar'])))
89
88
        self.assertEqual([
90
89
            [(134217727, 'foo'), (134217727, 'bar')],
91
90
            [(67108864, 'foo'), (67108864, 'bar')],
178
177
        # assertion.
179
178
        self.assertEqual([],
180
179
            list(bisect_multi_bytes(
181
 
                missing_last_content,268435456 - 1 , ['foo', 'bar'])))
 
180
                missing_last_content, 268435456 - 1, ['foo', 'bar'])))
182
181
        self.assertEqual([
183
182
            [(134217727, 'foo'), (134217727, 'bar')],
184
183
            [(201326590, 'foo'), (201326590, 'bar')],