/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 breezy/tests/test_shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf_ui.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from io import BytesIO
19
18
import os
20
19
import sys
21
20
from textwrap import dedent
27
26
    shelf,
28
27
    tests,
29
28
    )
 
29
from ..sixish import (
 
30
    BytesIO,
 
31
    )
30
32
from . import script
31
33
from . import (
32
34
    features,
300
302
    def test_shelve_old_root_preserved(self):
301
303
        tree1 = self.make_branch_and_tree('tree1')
302
304
        tree1.commit('add root')
303
 
        tree1_root_id = tree1.path2id('')
 
305
        tree1_root_id = tree1.get_root_id()
304
306
        tree2 = self.make_branch_and_tree('tree2')
305
307
        rev2 = tree2.commit('add root')
306
 
        self.assertNotEqual(tree1_root_id, tree2.path2id(''))
 
308
        self.assertNotEqual(tree1_root_id, tree2.get_root_id())
307
309
        tree1.merge_from_branch(tree2.branch,
308
310
                                from_revision=revision.NULL_REVISION)
309
311
        tree1.commit('merging in tree2')
310
 
        self.assertEqual(tree1_root_id, tree1.path2id(''))
 
312
        self.assertEqual(tree1_root_id, tree1.get_root_id())
311
313
        # This is essentially assertNotRaises(InconsistentDelta)
312
314
        # With testtools 0.9.9, it can be rewritten as:
313
315
        # with ExpectedException(AssertionError,