← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_file_graph.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/per_repository/test_file_graph.py
1
 
# Copyright (C) 2011 Canonical Ltd
 
1
# Copyright (C) 2011, 2016 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
32
32
        revid2 = tree.commit("msg")
33
33
        self.addCleanup(tree.lock_read().unlock)
34
34
        graph = tree.branch.repository.get_file_graph()
35
 
        self.assertEquals({
 
35
        self.assertEqual({
36
36
            ("fileid", revid2): (("fileid", revid1),), ("fileid", revid1):()},
37
37
            graph.get_parent_map([("fileid", revid2), ("fileid", revid1)]))