← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

  • Committer: Martin Packman
  • Date: 2011-11-17 13:45:49 UTC
  • mto: This revision was merged to the branch mainline in revision 6271.
  • Revision ID: martin.packman@canonical.com-20111117134549-080e1fhtrzoicexg
https://launchpad.net/bugs/891582
Only assert FileExists path in test_transform directory clash tests to avoid stringification fallout

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from bzrlib.branchbuilder import BranchBuilder
 
19
from bzrlib.tests import TestCaseWithMemoryTransport
 
20
from bzrlib.tests.matchers import MatchesAncestry
 
21
 
 
22
 
 
23
class TestAncestry(TestCaseWithMemoryTransport):
 
24
 
 
25
    def test_straightline_ancestry(self):
 
26
        """Test ancestry file when just committing."""
 
27
        builder = BranchBuilder(self.get_transport())
 
28
        rev_id_one = builder.build_commit()
 
29
        rev_id_two = builder.build_commit()
 
30
        branch = builder.get_branch()
 
31
        self.assertThat([rev_id_one, rev_id_two],
 
32
            MatchesAncestry(branch.repository, rev_id_two))
 
33
        self.assertThat([rev_id_one],
 
34
            MatchesAncestry(branch.repository, rev_id_one))
 
35
 
 
36
# TODO: check that ancestry is updated to include indirectly merged revisions