← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
21
21
import os
22
22
 
23
23
from bzrlib import osutils
24
 
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
 
24
from bzrlib.tests import TestCaseWithTransport
25
25
from bzrlib.testament import (
26
26
    Testament,
27
27
    StrictTestament,
28
28
    StrictTestament3,
29
29
    )
30
30
from bzrlib.transform import TreeTransform
 
31
from bzrlib.tests.features import (
 
32
    SymlinkFeature,
 
33
    )
31
34
 
32
35
 
33
36
class TestamentSetup(TestCaseWithTransport):
34
37
 
35
38
    def setUp(self):
36
39
        super(TestamentSetup, self).setUp()
37
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
40
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
38
41
        self.wt.set_root_id('TREE_ROT')
39
42
        b = self.b = self.wt.branch
40
43
        b.nick = "test branch"