/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-11-21 20:14:44 UTC
  • mfrom: (6821.1.1 ignore-warnings)
  • Revision ID: jelmer@jelmer.uk-20171121201444-dvb7yjku3zwjev83
Merge lp:~jelmer/brz/ignore-warnings.

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 (
 
25
    TestCase,
 
26
    TestCaseWithTransport,
 
27
    )
 
28
from breezy.tree import (
 
29
    FileTimestampUnavailable,
 
30
    InterTree,
 
31
    )
 
32
 
 
33
 
 
34
class TestErrors(TestCase):
 
35
 
 
36
    def test_file_timestamp_unavailable(self):
 
37
        e = FileTimestampUnavailable("/path/foo")
 
38
        self.assertEqual("The filestamp for /path/foo is not available.",
 
39
                         str(e))
27
40
 
28
41
 
29
42
class TestInterTree(TestCaseWithTransport):
140
153
        # we need to pass a known file with an unknown file to get this to
141
154
        # fail when expected.
142
155
        delta = wt.changes_from(wt.basis_tree(),
143
 
            specific_files=['known_file', 'unknown_file'] ,
 
156
            specific_files=['known_file', 'unknown_file'],
144
157
            require_versioned=False)
145
158
        self.assertEqual(len(delta.added), 1)
146
159
 
193
206
        :param exp_other_paths: A list of other_path values.
194
207
        :param iterator: The iterator to step
195
208
        """
196
 
        path, file_id, master_ie, other_values = iterator.next()
 
209
        path, file_id, master_ie, other_values = next(iterator)
197
210
        self.assertEqual((exp_path, exp_file_id), (path, file_id),
198
211
                         'Master entry did not match')
199
212
        if master_has_node:
245
258
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
246
259
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
247
260
        self.assertWalkerNext(u'b/c', 'c-id', True, [u'b/c'], iterator)
248
 
        self.assertRaises(StopIteration, iterator.next)
 
261
        self.assertRaises(StopIteration, next, iterator)
249
262
 
250
263
    def test_master_has_extra(self):
251
264
        tree = self.make_branch_and_tree('tree')
264
277
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
265
278
        self.assertWalkerNext(u'c', 'c-id', True, [None], iterator)
266
279
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
267
 
        self.assertRaises(StopIteration, iterator.next)
 
280
        self.assertRaises(StopIteration, next, iterator)
268
281
 
269
282
    def test_master_renamed_to_earlier(self):
270
283
        """The record is still present, it just shows up early."""
282
295
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
283
296
        self.assertWalkerNext(u'b', 'd-id', True, [u'd'], iterator)
284
297
        self.assertWalkerNext(u'c', 'c-id', True, [u'c'], iterator)
285
 
        self.assertRaises(StopIteration, iterator.next)
 
298
        self.assertRaises(StopIteration, next, iterator)
286
299
 
287
300
    def test_master_renamed_to_later(self):
288
301
        tree = self.make_branch_and_tree('tree')
299
312
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
300
313
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
301
314
        self.assertWalkerNext(u'e', 'b-id', True, [u'b'], iterator)
302
 
        self.assertRaises(StopIteration, iterator.next)
 
315
        self.assertRaises(StopIteration, next, iterator)
303
316
 
304
317
    def test_other_extra_in_middle(self):
305
318
        tree = self.make_branch_and_tree('tree')
315
328
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
316
329
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
317
330
        self.assertWalkerNext(u'b', 'b-id', False, [u'b'], iterator)
318
 
        self.assertRaises(StopIteration, iterator.next)
 
331
        self.assertRaises(StopIteration, next, iterator)
319
332
 
320
333
    def test_other_extra_at_end(self):
321
334
        tree = self.make_branch_and_tree('tree')
331
344
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
332
345
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
333
346
        self.assertWalkerNext(u'd', 'd-id', False, [u'd'], iterator)
334
 
        self.assertRaises(StopIteration, iterator.next)
 
347
        self.assertRaises(StopIteration, next, iterator)
335
348
 
336
349
    def test_others_extra_at_end(self):
337
350
        tree = self.make_branch_and_tree('tree')
357
370
        self.assertWalkerNext(u'c', 'c-id', False, [u'c', u'c', u'c'], iterator)
358
371
        self.assertWalkerNext(u'd', 'd-id', False, [None, u'd', u'd'], iterator)
359
372
        self.assertWalkerNext(u'e', 'e-id', False, [None, u'e', None], iterator)
360
 
        self.assertRaises(StopIteration, iterator.next)
 
373
        self.assertRaises(StopIteration, next, iterator)
361
374
 
362
375
    def test_different_file_id_in_others(self):
363
376
        tree = self.make_branch_and_tree('tree')
385
398
        self.assertWalkerNext(u'c', 'c-id', True, [u'c', u'c'], iterator)
386
399
        self.assertWalkerNext(u'c/d', 'b-id', True, [u'c/d', u'b'], iterator)
387
400
        self.assertWalkerNext(u'c/e', 'a-id', True, [u'a', u'a'], iterator)
388
 
        self.assertRaises(StopIteration, iterator.next)
 
401
        self.assertRaises(StopIteration, next, iterator)
389
402
 
390
403
    def assertCmpByDirblock(self, cmp_val, path1, path2):
391
404
        self.assertEqual(cmp_val,