← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
247
247
        try:
248
248
            bzrdir.destroy_branch()
249
249
        except (errors.UnsupportedOperation, errors.TransportNotPossible):
250
 
            raise TestNotApplicable('Format does not support destroying tree')
 
250
            raise TestNotApplicable('Format does not support destroying branch')
251
251
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
252
252
        bzrdir.create_branch()
253
253
        bzrdir.open_branch()
523
523
        dir = self.make_bzrdir('source')
524
524
        try:
525
525
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
526
 
                referenced_branch)
 
526
                target_branch=referenced_branch)
527
527
        except errors.IncompatibleFormat:
528
528
            # this is ok too, not all formats have to support references.
529
529
            return
626
626
        dir = self.make_bzrdir('source')
627
627
        try:
628
628
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
629
 
                referenced_branch)
 
629
                target_branch=referenced_branch)
630
630
        except errors.IncompatibleFormat:
631
631
            # this is ok too, not all formats have to support references.
632
632
            return
691
691
        dir = self.make_bzrdir('source')
692
692
        try:
693
693
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
694
 
                referenced_branch)
 
694
                target_branch=referenced_branch)
695
695
        except errors.IncompatibleFormat:
696
696
            # this is ok too, not all formats have to support references.
697
697
            return
966
966
        dir = self.make_bzrdir('source')
967
967
        try:
968
968
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
969
 
                referenced_branch)
 
969
                target_branch=referenced_branch)
970
970
        except errors.IncompatibleFormat:
971
971
            # this is ok too, not all formats have to support references.
972
972
            return
986
986
        dir = self.make_bzrdir('source')
987
987
        try:
988
988
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
989
 
                referenced_tree.branch)
 
989
                target_branch=referenced_tree.branch)
990
990
        except errors.IncompatibleFormat:
991
991
            # this is ok too, not all formats have to support references.
992
992
            return
1012
1012
        dir = self.make_bzrdir('source')
1013
1013
        try:
1014
1014
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1015
 
                referenced_tree.branch)
 
1015
                target_branch=referenced_tree.branch)
1016
1016
        except errors.IncompatibleFormat:
1017
1017
            # this is ok too, not all formats have to support references.
1018
1018
            return
1077
1077
        dir = self.make_bzrdir('source')
1078
1078
        try:
1079
1079
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1080
 
                referenced_branch)
 
1080
                target_branch=referenced_branch)
1081
1081
        except errors.IncompatibleFormat:
1082
1082
            # this is ok too, not all formats have to support references.
1083
1083
            return
1103
1103
        dir = self.make_bzrdir('source')
1104
1104
        try:
1105
1105
            reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
1106
 
                referenced_branch)
 
1106
                target_branch=referenced_branch)
1107
1107
        except errors.IncompatibleFormat:
1108
1108
            # this is ok too, not all formats have to support references.
1109
1109
            return
1858
1858
        thisdir = self.make_bzrdir('this')
1859
1859
        try:
1860
1860
            bzrlib.branch.BranchReferenceFormat().initialize(
1861
 
                thisdir, master)
 
1861
                thisdir, target_branch=master)
1862
1862
        except errors.IncompatibleFormat:
1863
1863
            return
1864
1864
        unused_repo = thisdir.create_repository()