← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_create_clone.py

(vila) Fix bzrlib.tests.test_gpg.TestVerify.test_verify_revoked_signature
 with recent versions of gpg. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_create_clone.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009-2012 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
96
96
        revid = tree.commit('a second commit')
97
97
        source = tree.branch
98
98
        target_transport = self.get_transport('target')
99
 
        result = tree.branch.create_clone_on_transport(target_transport,
100
 
            stacked_on=trunk.base)
 
99
        try:
 
100
            result = tree.branch.create_clone_on_transport(target_transport,
 
101
                stacked_on=trunk.base)
 
102
        except errors.UnstackableBranchFormat:
 
103
            if not trunk.repository._format.supports_full_versioned_files:
 
104
                raise tests.TestNotApplicable("can not stack on format")
 
105
            raise
101
106
        self.assertEqual(revid, result.last_revision())
102
107
        self.assertEqual(trunk.base, result.get_stacked_on_url())
103
108
 
128
133
        trunk = tree.branch.create_clone_on_transport(
129
134
            self.get_transport('trunk'))
130
135
        revid = tree.commit('a second commit')
131
 
        source = tree.branch
132
136
        target_transport = self.get_transport('target')
133
137
        self.hook_calls = []
134
138
        branch.Branch.hooks.install_named_hook(
135
139
            'pre_change_branch_tip', self.assertBranchHookBranchIsStacked, None)
136
 
        result = tree.branch.create_clone_on_transport(target_transport,
137
 
            stacked_on=trunk.base)
 
140
        try:
 
141
            result = tree.branch.create_clone_on_transport(target_transport,
 
142
                stacked_on=trunk.base)
 
143
        except errors.UnstackableBranchFormat:
 
144
            if not trunk.repository._format.supports_full_versioned_files:
 
145
                raise tests.TestNotApplicable("can not stack on format")
 
146
            raise
138
147
        self.assertEqual(revid, result.last_revision())
139
148
        self.assertEqual(trunk.base, result.get_stacked_on_url())
140
149
        # Smart servers invoke hooks on both sides