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

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 01:35:53 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610013553-560y7mn3su4pp763
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_tree.py
1
 
# Copyright (C) 2006, 2008 Canonical Ltd
 
1
# Copyright (C) 2006-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 Tree and InterTree."""
18
18
 
19
 
from bzrlib import (
 
19
from breezy import (
20
20
    errors,
21
21
    revision,
22
 
    tests,
23
22
    tree as _mod_tree,
24
23
    )
25
 
from bzrlib.tests import TestCaseWithTransport
26
 
from bzrlib.tree import InterTree
 
24
from breezy.tests import TestCaseWithTransport
 
25
from breezy.tree import InterTree
27
26
 
28
27
 
29
28
class TestInterTree(TestCaseWithTransport):
193
192
        :param exp_other_paths: A list of other_path values.
194
193
        :param iterator: The iterator to step
195
194
        """
196
 
        path, file_id, master_ie, other_values = iterator.next()
 
195
        path, file_id, master_ie, other_values = next(iterator)
197
196
        self.assertEqual((exp_path, exp_file_id), (path, file_id),
198
197
                         'Master entry did not match')
199
198
        if master_has_node:
245
244
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
246
245
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
247
246
        self.assertWalkerNext(u'b/c', 'c-id', True, [u'b/c'], iterator)
248
 
        self.assertRaises(StopIteration, iterator.next)
 
247
        self.assertRaises(StopIteration, next, iterator)
249
248
 
250
249
    def test_master_has_extra(self):
251
250
        tree = self.make_branch_and_tree('tree')
264
263
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
265
264
        self.assertWalkerNext(u'c', 'c-id', True, [None], iterator)
266
265
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
267
 
        self.assertRaises(StopIteration, iterator.next)
 
266
        self.assertRaises(StopIteration, next, iterator)
268
267
 
269
268
    def test_master_renamed_to_earlier(self):
270
269
        """The record is still present, it just shows up early."""
282
281
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
283
282
        self.assertWalkerNext(u'b', 'd-id', True, [u'd'], iterator)
284
283
        self.assertWalkerNext(u'c', 'c-id', True, [u'c'], iterator)
285
 
        self.assertRaises(StopIteration, iterator.next)
 
284
        self.assertRaises(StopIteration, next, iterator)
286
285
 
287
286
    def test_master_renamed_to_later(self):
288
287
        tree = self.make_branch_and_tree('tree')
299
298
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
300
299
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
301
300
        self.assertWalkerNext(u'e', 'b-id', True, [u'b'], iterator)
302
 
        self.assertRaises(StopIteration, iterator.next)
 
301
        self.assertRaises(StopIteration, next, iterator)
303
302
 
304
303
    def test_other_extra_in_middle(self):
305
304
        tree = self.make_branch_and_tree('tree')
315
314
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
316
315
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
317
316
        self.assertWalkerNext(u'b', 'b-id', False, [u'b'], iterator)
318
 
        self.assertRaises(StopIteration, iterator.next)
 
317
        self.assertRaises(StopIteration, next, iterator)
319
318
 
320
319
    def test_other_extra_at_end(self):
321
320
        tree = self.make_branch_and_tree('tree')
331
330
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
332
331
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
333
332
        self.assertWalkerNext(u'd', 'd-id', False, [u'd'], iterator)
334
 
        self.assertRaises(StopIteration, iterator.next)
 
333
        self.assertRaises(StopIteration, next, iterator)
335
334
 
336
335
    def test_others_extra_at_end(self):
337
336
        tree = self.make_branch_and_tree('tree')
357
356
        self.assertWalkerNext(u'c', 'c-id', False, [u'c', u'c', u'c'], iterator)
358
357
        self.assertWalkerNext(u'd', 'd-id', False, [None, u'd', u'd'], iterator)
359
358
        self.assertWalkerNext(u'e', 'e-id', False, [None, u'e', None], iterator)
360
 
        self.assertRaises(StopIteration, iterator.next)
 
359
        self.assertRaises(StopIteration, next, iterator)
361
360
 
362
361
    def test_different_file_id_in_others(self):
363
362
        tree = self.make_branch_and_tree('tree')
385
384
        self.assertWalkerNext(u'c', 'c-id', True, [u'c', u'c'], iterator)
386
385
        self.assertWalkerNext(u'c/d', 'b-id', True, [u'c/d', u'b'], iterator)
387
386
        self.assertWalkerNext(u'c/e', 'a-id', True, [u'a', u'a'], iterator)
388
 
        self.assertRaises(StopIteration, iterator.next)
 
387
        self.assertRaises(StopIteration, next, iterator)
389
388
 
390
389
    def assertCmpByDirblock(self, cmp_val, path1, path2):
391
390
        self.assertEqual(cmp_val,