← 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: Vincent Ladeuil
  • Date: 2007-11-24 14:20:59 UTC
  • mto: (3928.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3929.
  • Revision ID: v.ladeuil+lp@free.fr-20071124142059-2114qtsgfdv8g9p1
Ssl files needed for the test https server.

* bzrlib/tests/ssl_certs/create_ssls.py: 
Script to create the ssl keys and certificates.

* bzrlib/tests/ssl_certs/server.crt: 
Server certificate signed by the certificate authority.

* bzrlib/tests/ssl_certs/server.csr: 
Server certificate signing request.

* bzrlib/tests/ssl_certs/server_without_pass.key: 
Server key usable without password.

* bzrlib/tests/ssl_certs/server_with_pass.key: 
Server key.

* bzrlib/tests/ssl_certs/ca.key: 
Certificate authority private key.

* bzrlib/tests/ssl_certs/ca.crt: 
Certificate authority certificate.

* bzrlib/tests/ssl_certs/__init__.py: 
Provide access to ssl files (keys and certificates). 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
from cStringIO import StringIO
22
22
from bzrlib.tests import TestCaseWithMemoryTransport
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.branchbuilder import BranchBuilder
 
25
from bzrlib.revision import is_ancestor
25
26
 
26
27
 
27
28
class TestAncestry(TestCaseWithMemoryTransport):
41
42
            rev_id_two, branch)
42
43
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
43
44
 
 
45
    def test_none_is_ancestor_empty_branch(self):
 
46
        branch = self.make_branch('.')
 
47
        self.assertTrue(is_ancestor('null:', 'null:', branch))
 
48
 
 
49
    def test_none_is_ancestor_non_empty_branch(self):
 
50
        builder = BranchBuilder(self.get_transport())
 
51
        rev_id = builder.build_commit()
 
52
        branch = builder.get_branch()
 
53
        self.assertTrue(is_ancestor('null:', 'null:', branch))
 
54
        self.assertTrue(is_ancestor(rev_id, 'null:',  branch))
 
55
        self.assertFalse(is_ancestor('null:', rev_id, branch))
 
56
 
 
57
 
44
58
# TODO: check that ancestry is updated to include indirectly merged revisions