/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: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir, tests, workingtree
21
 
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit4
22
 
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack4
23
 
 
 
20
from bzrlib import bzrdir, tests
24
21
 
25
22
 
26
23
class TestSplit(tests.TestCaseWithTransport):
27
24
 
28
25
    def test_split(self):
29
26
        self.build_tree(['a/', 'a/b/', 'a/b/c'])
30
 
        wt = self.make_branch_and_tree('a', format='rich-root-pack')
 
27
        wt = self.make_branch_and_tree('a')
31
28
        wt.add(['b', 'b/c'])
32
29
        wt.commit('rev1')
33
30
        self.run_bzr('split a/b')
34
 
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
 
31
        self.run_bzr_error(('.* is not versioned',), 'split q')
35
32
 
36
33
    def test_split_repo_failure(self):
37
34
        repo = self.make_repository('branch', shared=True, format='knit')
41
38
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
42
39
        wt.commit('added files')
43
40
        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)