/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_revisiontree.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_revisiontree.py
1
 
# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2012, 2016 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
17
17
 
18
18
"""Tests for the RevisionTree class."""
19
19
 
20
 
from bzrlib import (
 
20
from breezy import (
21
21
    errors,
22
22
    revision,
23
23
    )
24
 
import bzrlib
25
 
from bzrlib.inventory import ROOT_ID
26
 
from bzrlib.tests import TestCaseWithTransport
 
24
from breezy.tree import FileTimestampUnavailable
 
25
from breezy.tests import TestCaseWithTransport
27
26
 
28
27
 
29
28
class TestTreeWithCommits(TestCaseWithTransport):
60
59
    def test_empty_no_root(self):
61
60
        null_tree = self.t.branch.repository.revision_tree(
62
61
            revision.NULL_REVISION)
63
 
        self.assertIs(None, null_tree.inventory.root)
 
62
        self.assertIs(None, null_tree.get_root_id())
 
63
 
 
64
    def test_get_file_revision_root(self):
 
65
        self.assertEqual(self.rev_id,
 
66
            self.rev_tree.get_file_revision(u'', self.rev_tree.get_root_id()))
 
67
 
 
68
    def test_get_file_revision(self):
 
69
        self.build_tree_contents([('a', b'initial')])
 
70
        self.t.add(['a'])
 
71
        revid1 = self.t.commit('add a')
 
72
        revid2 = self.t.commit('another change', allow_pointless=True)
 
73
        tree = self.t.branch.repository.revision_tree(revid2)
 
74
        self.assertEqual(revid1,
 
75
            tree.get_file_revision('a'))
64
76
 
65
77
    def test_get_file_mtime_ghost(self):
66
 
        file_id = iter(self.rev_tree).next()
67
 
        self.rev_tree.inventory[file_id].revision = 'ghostrev'
68
 
        self.assertRaises(errors.FileTimestampUnavailable, 
69
 
            self.rev_tree.get_file_mtime, file_id)
 
78
        path = next(iter(self.rev_tree.all_versioned_paths()))
 
79
        self.rev_tree.root_inventory.get_entry(self.rev_tree.path2id(path)).revision = b'ghostrev'
 
80
        self.assertRaises(FileTimestampUnavailable, 
 
81
            self.rev_tree.get_file_mtime, path)