/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 bzrlib/tests/test_ancestry.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-07 18:23:13 UTC
  • mto: (6615.3.1 2.7)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20160207182313-jwz7z3vj4mpyjn7y
Ensure http://pad.lv/1323805 won't come back.

Since the 2.6.0 release pypi policy changed and release tarballs can't be
hosted on launchpad anymore, they have to be uploaded to
http://pypi.python.org/pypi


This fixes setup.py sdist to generate the right tarball with nearly the same
content as the one produced for 2.7.0.

Such a tarball have been uploaded to pypi properly signed and tested for
installation in venv.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
1
 
# Copyright (C) 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from cStringIO import StringIO
19
 
import os
20
 
import sys
21
 
 
 
18
from bzrlib.branchbuilder import BranchBuilder
22
19
from bzrlib.tests import TestCaseWithMemoryTransport
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.branchbuilder import BranchBuilder
 
20
from bzrlib.tests.matchers import MatchesAncestry
25
21
 
26
22
 
27
23
class TestAncestry(TestCaseWithMemoryTransport):
28
24
 
29
 
    def assertAncestryEqual(self, expected, revision_id, branch):
30
 
        """Assert that the ancestry of revision_id in branch is as expected."""
31
 
        ancestry = branch.repository.get_ancestry(revision_id)
32
 
        self.assertEqual(expected, ancestry)
33
 
 
34
25
    def test_straightline_ancestry(self):
35
26
        """Test ancestry file when just committing."""
36
27
        builder = BranchBuilder(self.get_transport())
37
28
        rev_id_one = builder.build_commit()
38
29
        rev_id_two = builder.build_commit()
39
30
        branch = builder.get_branch()
40
 
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
41
 
            rev_id_two, branch)
42
 
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, 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))
43
35
 
44
36
# TODO: check that ancestry is updated to include indirectly merged revisions