/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 bzrlib/tests/blackbox/test_split.py

  • Committer: Vincent Ladeuil
  • Date: 2009-09-19 16:14:10 UTC
  • mto: (4707.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4708.
  • Revision ID: v.ladeuil+lp@free.fr-20090919161410-lmlunl2q9kbzd3x0
Fix OSX and FreeBSD failures.

* bzrlib/tests/__init__.py:
(TestCaseWithMemoryTransport._make_test_root): Fixing the problem
at the root, if we usr the real path there, we catch 99% of the
consequences.

* bzrlib/tests/test_osutils.py:
(TestCanonicalRelPath.test_canonical_relpath_simple,
TestCanonicalRelPath.test_canonical_relpath_missing_tail): No need
to use realpath here anymore.

* bzrlib/tests/script.py:
(ScriptRunner.do_rm): OSX and BSD raises a different exception,
and windows too even if that will require real testing (but
osutils._delete_file_or_dir use the same trick for unlink so it's
a pretty safe bet).

* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Watch for OSX trick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_split.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
 
 
18
import os
 
19
 
 
20
from bzrlib import bzrdir, tests, workingtree
 
21
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit4
 
22
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack4
 
23
 
 
24
 
 
25
 
 
26
class TestSplit(tests.TestCaseWithTransport):
 
27
 
 
28
    def test_split(self):
 
29
        self.build_tree(['a/', 'a/b/', 'a/b/c'])
 
30
        wt = self.make_branch_and_tree('a', format='rich-root-pack')
 
31
        wt.add(['b', 'b/c'])
 
32
        wt.commit('rev1')
 
33
        self.run_bzr('split a/b')
 
34
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
 
35
 
 
36
    def test_split_repo_failure(self):
 
37
        repo = self.make_repository('branch', shared=True, format='knit')
 
38
        a_branch = repo.bzrdir.create_branch()
 
39
        self.build_tree(['a/', 'a/b/', 'a/b/c/', 'a/b/c/d'])
 
40
        wt = a_branch.create_checkout('a', lightweight=True)
 
41
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
 
42
        wt.commit('added files')
 
43
        self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')
 
44
 
 
45
    def test_split_tree_failure(self):
 
46
        tree = self.make_branch_and_tree('tree', format='pack-0.92')
 
47
        self.build_tree(['tree/subtree/'])
 
48
        tree.add('subtree')
 
49
        tree.commit('added subtree')
 
50
        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
 
51
                           'split tree/subtree')
 
52
 
 
53
    def split_formats(self, format, repo_format):
 
54
        tree = self.make_branch_and_tree('rich-root', format=format)
 
55
        self.build_tree(['rich-root/a/'])
 
56
        tree.add('a')
 
57
        self.run_bzr(['split', 'rich-root/a'])
 
58
        subtree = workingtree.WorkingTree.open('rich-root/a')
 
59
        self.assertIsInstance(subtree.branch.repository._format,
 
60
                              repo_format)
 
61
 
 
62
    def test_split_rich_root(self):
 
63
        self.split_formats('rich-root', RepositoryFormatKnit4)
 
64
 
 
65
    def test_split_rich_root_pack(self):
 
66
        self.split_formats('rich-root-pack', RepositoryFormatKnitPack4)