← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_split.py

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_split.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
 
18
 
import os
19
 
 
20
 
from bzrlib import bzrdir, tests
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from bzrlib import tests, workingtree
 
19
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit4
 
20
from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack4
 
21
 
21
22
 
22
23
 
23
24
class TestSplit(tests.TestCaseWithTransport):
24
25
 
25
26
    def test_split(self):
26
27
        self.build_tree(['a/', 'a/b/', 'a/b/c'])
27
 
        wt = self.make_branch_and_tree('a')
 
28
        wt = self.make_branch_and_tree('a', format='rich-root-pack')
28
29
        wt.add(['b', 'b/c'])
29
30
        wt.commit('rev1')
30
31
        self.run_bzr('split a/b')
31
 
        self.run_bzr_error(('.* is not versioned',), 'split q')
 
32
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
32
33
 
33
34
    def test_split_repo_failure(self):
34
35
        repo = self.make_repository('branch', shared=True, format='knit')
38
39
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
39
40
        wt.commit('added files')
40
41
        self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')
 
42
 
 
43
    def test_split_tree_failure(self):
 
44
        tree = self.make_branch_and_tree('tree', format='pack-0.92')
 
45
        self.build_tree(['tree/subtree/'])
 
46
        tree.add('subtree')
 
47
        tree.commit('added subtree')
 
48
        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
 
49
                           'split tree/subtree')
 
50
 
 
51
    def split_formats(self, format, repo_format):
 
52
        tree = self.make_branch_and_tree('rich-root', format=format)
 
53
        self.build_tree(['rich-root/a/'])
 
54
        tree.add('a')
 
55
        self.run_bzr(['split', 'rich-root/a'])
 
56
        subtree = workingtree.WorkingTree.open('rich-root/a')
 
57
        self.assertIsInstance(subtree.branch.repository._format,
 
58
                              repo_format)
 
59
 
 
60
    def test_split_rich_root(self):
 
61
        self.split_formats('rich-root', RepositoryFormatKnit4)
 
62
 
 
63
    def test_split_rich_root_pack(self):
 
64
        self.split_formats('rich-root-pack', RepositoryFormatKnitPack4)