← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisiontree.py
1
 
# Copyright (C) 2006, 2008-2011 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
58
58
    def test_empty_no_root(self):
59
59
        null_tree = self.t.branch.repository.revision_tree(
60
60
            revision.NULL_REVISION)
61
 
        self.assertIs(None, null_tree.inventory.root)
62
61
        self.assertIs(None, null_tree.get_root_id())
63
62
 
64
63
    def test_get_file_revision_root(self):
65
 
        self.assertEquals(self.rev_id,
 
64
        self.assertEqual(self.rev_id,
66
65
            self.rev_tree.get_file_revision(self.rev_tree.get_root_id()))
67
66
 
68
67
    def test_get_file_revision(self):
71
70
        revid1 = self.t.commit('add a')
72
71
        revid2 = self.t.commit('another change', allow_pointless=True)
73
72
        tree = self.t.branch.repository.revision_tree(revid2)
74
 
        self.assertEquals(revid1,
 
73
        self.assertEqual(revid1,
75
74
            tree.get_file_revision(tree.path2id('a')))
76
75
 
77
76
    def test_get_file_mtime_ghost(self):
78
77
        file_id = iter(self.rev_tree.all_file_ids()).next()
79
 
        self.rev_tree.inventory[file_id].revision = 'ghostrev'
 
78
        self.rev_tree.root_inventory[file_id].revision = 'ghostrev'
80
79
        self.assertRaises(errors.FileTimestampUnavailable, 
81
80
            self.rev_tree.get_file_mtime, file_id)